diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:33 +0000 |
| commit | cdd572677ef7dd0ee1ad7618573a6ffc73331348 (patch) | |
| tree | 2939b610e453fb7a21774f749f7012c29622e940 | |
| parent | 8bdad60dda5ce8fe5ffd6b6bec69ff5008cdd454 (diff) | |
| parent | e56141599a38a4915aa7dd72c995b95b8f428e40 (diff) | |
| download | bt-cdd572677ef7dd0ee1ad7618573a6ffc73331348.tar.gz | |
Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21
| -rw-r--r-- | msm8909/libbt-vendor/Android.mk | 2 | ||||
| -rw-r--r-- | msm8909/libbt-vendor/src/bt_vendor_qcom.c | 2 |
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) { |