Remove hardcoded LOCAL_MODULE_PATHS from vendor components. (display)
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: Ibdac125fdd8921d03d017f75ad5f1cf12501c0ef
This commit is contained in:
parent
77ee4172a5
commit
564e17315a
|
@ -23,7 +23,7 @@ include $(BUILD_COPY_HEADERS)
|
|||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
|
||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
||||
LOCAL_PROPRIETARY_MODULE := true
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||
LOCAL_SHARED_LIBRARIES := $(common_libs) libdl libmemalloc
|
||||
|
|
|
@ -3,7 +3,7 @@ include $(LOCAL_PATH)/../common.mk
|
|||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := libexternal
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||
LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay libqdutils
|
||||
|
|
|
@ -3,6 +3,7 @@ include $(LOCAL_PATH)/../common.mk
|
|||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := libgenlock
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_C_INCLUDES := $(common_includes)
|
||||
LOCAL_SHARED_LIBRARIES := liblog libcutils
|
||||
|
|
|
@ -19,7 +19,7 @@ include $(CLEAR_VARS)
|
|||
|
||||
LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM)
|
||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
||||
LOCAL_PROPRIETARY_MODULE := true
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||
LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc
|
||||
|
|
|
@ -4,7 +4,7 @@ include $(CLEAR_VARS)
|
|||
|
||||
LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
|
||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
||||
LOCAL_PROPRIETARY_MODULE := true
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) \
|
||||
$(TOP)/external/skia/include/core \
|
||||
|
|
|
@ -19,7 +19,7 @@ include $(CLEAR_VARS)
|
|||
|
||||
LOCAL_SRC_FILES := lights.c
|
||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
||||
LOCAL_PROPRIETARY_MODULE := true
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_SHARED_LIBRARIES := liblog
|
||||
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdlights\"
|
||||
LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
|
||||
|
|
|
@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
|
|||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
||||
LOCAL_PROPRIETARY_MODULE := true
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_C_INCLUDES += hardware/libhardware/include
|
||||
LOCAL_SHARED_LIBRARIES := liblog
|
||||
LOCAL_SRC_FILES := memtrack_msm.c kgsl.c
|
||||
|
|
|
@ -3,7 +3,7 @@ include $(LOCAL_PATH)/../common.mk
|
|||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := liboverlay
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||
LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libmemalloc libsync
|
||||
|
|
|
@ -20,7 +20,7 @@ include $(CLEAR_VARS)
|
|||
|
||||
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
|
||||
LOCAL_COPY_HEADERS := qdMetaData.h
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_SHARED_LIBRARIES := liblog libcutils
|
||||
LOCAL_C_INCLUDES := $(common_includes)
|
||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
|
||||
|
|
|
@ -3,7 +3,7 @@ include $(LOCAL_PATH)/../common.mk
|
|||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := libqservice
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||
LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder
|
||||
|
|
|
@ -4,6 +4,7 @@ include $(CLEAR_VARS)
|
|||
|
||||
ifeq ($(USE_OPENGL_RENDERER),true)
|
||||
LOCAL_MODULE := libtilerenderer
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_CFLAGS := -DLOG_TAG=\"qdtilerenderer\"
|
||||
LOCAL_C_INCLUDES := \
|
||||
|
|
|
@ -3,7 +3,7 @@ include $(LOCAL_PATH)/../common.mk
|
|||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := libvirtual
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
|
||||
LOCAL_VENDOR_MODULE := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||
LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay libqdutils
|
||||
|
|
Loading…
Reference in New Issue