MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayne: Remove hardcoded LOCAL_MODULE_PATHS from vendor components

Browse source 
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)
This commit is contained in:
Vishwath Mohan 2017-06-17 10:36:16 -07:00 committed by Isaac Chen
parent 5a86a2763f
commit d9152046fa
7 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gps/android/Android.mk
View file

@ -2,8 +2,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.gnss@1.0-impl-qti LOCAL_MODULE := android.hardware.gnss@1.0-impl-qti
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_OWNER := qti
LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
AGnss.cpp \ AGnss.cpp \

4
gps/core/Android.mk
View file

@ -6,8 +6,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libloc_core LOCAL_MODULE := libloc_core
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_OWNER := qti
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
ifeq ($(TARGET_DEVICE),apq8026_lw) ifeq ($(TARGET_DEVICE),apq8026_lw)

4
gps/gnss/Android.mk
View file

@ -6,8 +6,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libgnss LOCAL_MODULE := libgnss
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_OWNER := qti
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \

4
gps/location/Android.mk
View file

@ -6,8 +6,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := liblocation_api LOCAL_MODULE := liblocation_api
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_OWNER := qti
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \

4
gps/utils/Android.mk
View file

@ -45,8 +45,8 @@ LOCAL_HEADER_LIBRARIES := \
liblocation_api_headers liblocation_api_headers
LOCAL_MODULE := libgps.utils LOCAL_MODULE := libgps.utils
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_OWNER := qti
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false

3
gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk
View file

@ -51,8 +51,7 @@ LOCAL_HEADER_LIBRARIES := \
libloc_stub_headers libloc_stub_headers
LOCAL_MODULE := libloc_pla LOCAL_MODULE := libloc_pla
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false

4
gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk
View file

@ -32,8 +32,8 @@ LOCAL_C_INCLUDES:= \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
LOCAL_MODULE := libloc_stub LOCAL_MODULE := libloc_stub
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_OWNER := qti
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false