diff options
| author | Vishwath Mohan <vishwath@google.com> | 2017-06-17 10:36:16 -0700 |
|---|---|---|
| committer | Isaac Chen <isaacchen@isaacchen.cn> | 2018-09-05 00:00:08 +0000 |
| commit | d9152046fa10b9a36c5a17d1c21adc4d7a2b8a8e (patch) | |
| tree | 79b9ea075851bd618626b1acd09ec507d139fbcd | |
| parent | 5a86a2763fab4f0fe5bf57674db98d116a966d7f (diff) | |
wayne: Remove hardcoded LOCAL_MODULE_PATHS from vendor components
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: If6a495dd153c47f929de047fd48039b990348720
(cherry picked from commit e872612127cfbf55ceba01e9860e0acc47d64447)
| -rw-r--r-- | gps/android/Android.mk | 4 | ||||
| -rw-r--r-- | gps/core/Android.mk | 4 | ||||
| -rw-r--r-- | gps/gnss/Android.mk | 4 | ||||
| -rw-r--r-- | gps/location/Android.mk | 4 | ||||
| -rw-r--r-- | gps/utils/Android.mk | 4 | ||||
| -rw-r--r-- | gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk | 3 | ||||
| -rw-r--r-- | gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk | 4 |
7 files changed, 13 insertions, 14 deletions
diff --git a/gps/android/Android.mk b/gps/android/Android.mk index d503010..18845ef 100644 --- a/gps/android/Android.mk +++ b/gps/android/Android.mk @@ -2,8 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.0-impl-qti -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_OWNER := qti LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ AGnss.cpp \ diff --git a/gps/core/Android.mk b/gps/core/Android.mk index dba0b0a..6e58dc9 100644 --- a/gps/core/Android.mk +++ b/gps/core/Android.mk @@ -6,8 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libloc_core -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional ifeq ($(TARGET_DEVICE),apq8026_lw) diff --git a/gps/gnss/Android.mk b/gps/gnss/Android.mk index 4d738bd..e5b9dcc 100644 --- a/gps/gnss/Android.mk +++ b/gps/gnss/Android.mk @@ -6,8 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libgnss -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := \ diff --git a/gps/location/Android.mk b/gps/location/Android.mk index 6ac8e36..2792b12 100644 --- a/gps/location/Android.mk +++ b/gps/location/Android.mk @@ -6,8 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := liblocation_api -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := \ diff --git a/gps/utils/Android.mk b/gps/utils/Android.mk index 3f3b83a..197cd76 100644 --- a/gps/utils/Android.mk +++ b/gps/utils/Android.mk @@ -45,8 +45,8 @@ LOCAL_HEADER_LIBRARIES := \ liblocation_api_headers LOCAL_MODULE := libgps.utils -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false diff --git a/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk index ab13717..25d9439 100644 --- a/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk +++ b/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk @@ -51,8 +51,7 @@ LOCAL_HEADER_LIBRARIES := \ libloc_stub_headers LOCAL_MODULE := libloc_pla -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false diff --git a/gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk b/gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk index 08697cb..f4cec2b 100644 --- a/gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk +++ b/gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk @@ -32,8 +32,8 @@ LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/../include \ LOCAL_MODULE := libloc_stub -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false |