diff options
Diffstat (limited to 'msm8992')
| -rw-r--r-- | msm8992/Android.mk | 2 | ||||
| -rw-r--r-- | msm8992/libbt-vendor/Android.mk | 3 | ||||
| -rw-r--r-- | msm8992/libbt-vendor/src/bt_vendor_qcom.c | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/msm8992/Android.mk b/msm8992/Android.mk index 765f752..3939e41 100644 --- a/msm8992/Android.mk +++ b/msm8992/Android.mk @@ -1,3 +1,3 @@ -ifneq ($(filter msm8994 msm8992,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8994 msm8992 msm8996,$(TARGET_BOARD_PLATFORM)),) include $(call all-named-subdir-makefiles,libbt-vendor) endif diff --git a/msm8992/libbt-vendor/Android.mk b/msm8992/libbt-vendor/Android.mk index b09d2b6..ee4c0b8 100644 --- a/msm8992/libbt-vendor/Android.mk +++ b/msm8992/libbt-vendor/Android.mk @@ -20,9 +20,6 @@ ifeq ($(BOARD_HAVE_BLUETOOTH_QCOM),true) include $(CLEAR_VARS) -# b/24172208 many files do not compile with clang/llvm yet. -LOCAL_CLANG := false - BDROID_DIR:= system/bt LOCAL_SRC_FILES := \ diff --git a/msm8992/libbt-vendor/src/bt_vendor_qcom.c b/msm8992/libbt-vendor/src/bt_vendor_qcom.c index 2f3eed2..eb01fa5 100644 --- a/msm8992/libbt-vendor/src/bt_vendor_qcom.c +++ b/msm8992/libbt-vendor/src/bt_vendor_qcom.c @@ -1031,7 +1031,7 @@ static void ssr_cleanup(void) { if ((btSocType = get_bt_soc_type()) < 0) { ALOGE("%s: Failed to detect BT SOC Type", __FUNCTION__); - return -1; + return; } if (btSocType == BT_SOC_ROME) { |