summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishwath Mohan <vishwath@google.com>2017-05-02 12:08:58 -0700
committerVishwath Mohan <vishwath@google.com>2017-05-03 08:26:48 -0700
commit155bf125c39ceb1d4c37a552c5d857d462d0eae5 (patch)
tree03e38b0e583912517ede274e72399703c7dded1c
parentd3a629806151b3843f75511823019d6ce03546a6 (diff)
downloadbt-155bf125c39ceb1d4c37a552c5d857d462d0eae5.tar.gz
Remove hardcoded LOCAL_MODULE_PATHS from vendor components. (bt)
This CL replaces all LOCAL_MODULE_PATH_* definitions for vendor shared libraries with LOCAL_VENDOR_MODULE := true instead. This appropriately generates sanitized versions of these libraries to /data/asan/* while generating the stock versions in /vendor/lib* as desired. Needed for ASAN builds to work correctly. Bug: 37740897 Test: m -j40 && SANITIZE_TARGET="address" m -j40 # shared libs in $ANDROID_PRODUCT_OUT/vendor/lib* do not contain asan symbols, while the ones in $ANDROID_PRODUCT_OUT/data/asan/vendor/lib* do. Change-Id: Iaa67166fa32f236313cef111c43bc927076d64fa
-rw-r--r--msm8998/libbt-vendor/Android.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/msm8998/libbt-vendor/Android.mk b/msm8998/libbt-vendor/Android.mk
index 9cc65cf..f75ad1a 100644
--- a/msm8998/libbt-vendor/Android.mk
+++ b/msm8998/libbt-vendor/Android.mk
@@ -71,12 +71,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