summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishwath Mohan <vishwath@google.com>2017-06-20 00:35:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-20 00:35:27 +0000
commitd86fa1db746c84b080c6a458fbd3e4bdf28bfa18 (patch)
tree954a62691ce1e01e885cb335b7ca198241999a66
parentfe78306ad55193081107f470ebbd0e70a733c6e2 (diff)
parent2ddb2ebf89ad7ad08ef41f262ccbbb4fddc08fff (diff)
downloadbt-d86fa1db746c84b080c6a458fbd3e4bdf28bfa18.tar.gz
Remove hardcoded LOCAL_MODULE_PATHS from vendor components. (bt)
am: 2ddb2ebf89 Change-Id: I1a92bea33e79b3f08050a57ec077a89adf03bb0e
-rw-r--r--msm8909/libbt-vendor/Android.mk7
-rw-r--r--msm8996/libbt-vendor/Android.mk7
2 files changed, 2 insertions, 12 deletions
diff --git a/msm8909/libbt-vendor/Android.mk b/msm8909/libbt-vendor/Android.mk
index f275ba6..c46ea64 100644
--- a/msm8909/libbt-vendor/Android.mk
+++ b/msm8909/libbt-vendor/Android.mk
@@ -68,12 +68,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_OWNER := qcom
-ifdef TARGET_2ND_ARCH
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-endif
+LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS += -DBT_NV_SUPPORT
diff --git a/msm8996/libbt-vendor/Android.mk b/msm8996/libbt-vendor/Android.mk
index e923776..c30526a 100644
--- a/msm8996/libbt-vendor/Android.mk
+++ b/msm8996/libbt-vendor/Android.mk
@@ -74,12 +74,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_OWNER := qcom
-ifdef TARGET_2ND_ARCH
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-endif
+LOCAL_VENDOR_MODULE := true
ifneq ($(BOARD_ANT_WIRELESS_DEVICE),)
LOCAL_CFLAGS += -DENABLE_ANT