diff options
| author | Sunny Kapdi <sunnyk@codeaurora.org> | 2016-02-20 17:10:44 -0800 |
|---|---|---|
| committer | Steve Pfetsch <spfetsch@google.com> | 2016-02-24 16:58:01 -0800 |
| commit | 02a07fc80aabb0b81bf69b9f8d32f76a4baa276f (patch) | |
| tree | 6bbd826af4a3219f420197cc3d1d0783e9217e18 | |
| parent | 77239a181641dd9a182246a48920f30a5f3056c5 (diff) | |
| download | bt-02a07fc80aabb0b81bf69b9f8d32f76a4baa276f.tar.gz | |
Pick msm8992 HAL for msm8996
Change-Id: I96b9eb810bff42d9dcfbe4d371a401e0b6af3a9f
| -rw-r--r-- | Android.mk | 2 | ||||
| -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 |
4 files changed, 3 insertions, 6 deletions
@@ -3,7 +3,7 @@ ifneq ($(TARGET_BOARD_AUTO),true) ifneq ($(filter msm8960 msm8x27 msm8974 msm8226,$(TARGET_BOARD_PLATFORM)),) include $(call all-named-subdir-makefiles,msm8960) else - ifneq ($(filter msm8994 msm8992,$(TARGET_BOARD_PLATFORM)),) + ifneq ($(filter msm8994 msm8992 msm8996,$(TARGET_BOARD_PLATFORM)),) include $(call all-named-subdir-makefiles,msm8992) else ifneq ($(filter msm8909 ,$(TARGET_BOARD_PLATFORM)),) 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) { |