diff options
| author | Vishwath Mohan <vishwath@google.com> | 2017-06-17 10:54:13 -0700 |
|---|---|---|
| committer | Vishwath Mohan <vishwath@google.com> | 2017-06-17 10:54:13 -0700 |
| commit | 6fcf11aae8532b3466a224150906a3c63dbafb6c (patch) | |
| tree | 954a62691ce1e01e885cb335b7ca198241999a66 | |
| parent | fe78306ad55193081107f470ebbd0e70a733c6e2 (diff) | |
| download | bt-6fcf11aae8532b3466a224150906a3c63dbafb6c.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: I16f458cf46efd078ff0cc04dace4ec7ce0dbb47b
| -rw-r--r-- | msm8909/libbt-vendor/Android.mk | 7 | ||||
| -rw-r--r-- | msm8996/libbt-vendor/Android.mk | 7 |
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 |