summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-07-25 03:01:31 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-07-25 03:01:31 +0000
commit7181b956b7afd23994fa3e0ebafe5b15c33196c6 (patch)
tree11b8e60ea23e05fd5330be5f6e5fa7ec60683deb
parentaaa6d22b1ef89c71506691ac649584b2c0c1c20a (diff)
parent1dc5d53ddf0dd17d64dc39abe696d3f6f019b044 (diff)
downloadbt-7181b956b7afd23994fa3e0ebafe5b15c33196c6.tar.gz
Snap for 4911264 from 1dc5d53ddf0dd17d64dc39abe696d3f6f019b044 to qt-release
Change-Id: I2cce740a553bfc7e5e1f4f2107de9da768eca763
-rw-r--r--msm8909/libbt-vendor/Android.mk2
-rw-r--r--msm8909/libbt-vendor/src/bt_vendor_qcom.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/msm8909/libbt-vendor/Android.mk b/msm8909/libbt-vendor/Android.mk
index e79e308..d9b6e0f 100644
--- a/msm8909/libbt-vendor/Android.mk
+++ b/msm8909/libbt-vendor/Android.mk
@@ -64,7 +64,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_CFLAGS += -Wno-error
LOCAL_MODULE := libbt-vendor
-LOCAL_CLANG := false
+#LOCAL_CLANG := false
LOCAL_CXX_STL := none
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
diff --git a/msm8909/libbt-vendor/src/bt_vendor_qcom.c b/msm8909/libbt-vendor/src/bt_vendor_qcom.c
index 294c0c3..6b2f259 100644
--- a/msm8909/libbt-vendor/src/bt_vendor_qcom.c
+++ b/msm8909/libbt-vendor/src/bt_vendor_qcom.c
@@ -1076,7 +1076,7 @@ static void ssr_cleanup(int reason) {
if ((btSocType = get_bt_soc_type()) < 0) {
ALOGE("%s: Failed to detect BT SOC Type", __FUNCTION__);
- return -1;
+ return;
}
if (btSocType == BT_SOC_ROME) {