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)
65 lines
1.4 KiB
Makefile
65 lines
1.4 KiB
Makefile
ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
|
|
ifneq ($(BUILD_TINY_ANDROID),true)
|
|
#Compile this library only for builds with the latest modem image
|
|
|
|
LOCAL_PATH := $(call my-dir)
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
|
## Libs
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libutils \
|
|
libcutils \
|
|
liblog \
|
|
libloc_pla
|
|
|
|
LOCAL_SRC_FILES += \
|
|
loc_log.cpp \
|
|
loc_cfg.cpp \
|
|
msg_q.c \
|
|
linked_list.c \
|
|
loc_target.cpp \
|
|
platform_lib_abstractions/elapsed_millis_since_boot.cpp \
|
|
LocHeap.cpp \
|
|
LocTimer.cpp \
|
|
LocThread.cpp \
|
|
MsgTask.cpp \
|
|
loc_misc_utils.cpp \
|
|
loc_nmea.cpp
|
|
|
|
# Flag -std=c++11 is not accepted by compiler when LOCAL_CLANG is set to true
|
|
LOCAL_CFLAGS += \
|
|
-fno-short-enums \
|
|
-D_ANDROID_
|
|
|
|
ifeq ($(TARGET_BUILD_VARIANT),user)
|
|
LOCAL_CFLAGS += -DTARGET_BUILD_VARIANT_USER
|
|
endif
|
|
|
|
LOCAL_LDFLAGS += -Wl,--export-dynamic
|
|
|
|
## Includes
|
|
LOCAL_HEADER_LIBRARIES := \
|
|
libloc_pla_headers \
|
|
liblocation_api_headers
|
|
|
|
LOCAL_MODULE := libgps.utils
|
|
LOCAL_VENDOR_MODULE := true
|
|
LOCAL_MODULE_OWNER := qti
|
|
LOCAL_MODULE_TAGS := optional
|
|
|
|
LOCAL_PRELINK_MODULE := false
|
|
|
|
LOCAL_CFLAGS += $(GNSS_CFLAGS)
|
|
|
|
include $(BUILD_SHARED_LIBRARY)
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := libgps.utils_headers
|
|
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
|
|
include $(BUILD_HEADER_LIBRARY)
|
|
|
|
include $(addsuffix /Android.mk, $(addprefix $(LOCAL_PATH)/, platform_lib_abstractions))
|
|
endif # not BUILD_TINY_ANDROID
|
|
endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE
|