| commit | 6de1929161c4898b95a8b298bd3c9403fbbf00e2 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Feb 25 05:37:27 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Feb 25 05:37:27 2019 -0800 |
| tree | 2939b610e453fb7a21774f749f7012c29622e940 | |
| parent | 37248c9cdb2babc0516dc2ab322f8c5c052f4f0f [diff] | |
| parent | f78410c5ea794354fc0d8d3686480e77f2e0f569 [diff] |
Merge stage-aosp-master into pi-dev-plus-aosp am: f78410c5ea Change-Id: Ic9054251b98264776249e6c16f51265a2efe9e10
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_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 @@ if ((btSocType = get_bt_soc_type()) < 0) { ALOGE("%s: Failed to detect BT SOC Type", __FUNCTION__); - return -1; + return; } if (btSocType == BT_SOC_ROME) {