diff options
| author | Vishwath Mohan <vishwath@google.com> | 2017-05-02 11:35:12 -0700 |
|---|---|---|
| committer | Vishwath Mohan <vishwath@google.com> | 2017-05-02 16:53:46 -0700 |
| commit | 7e5fd2eed000640fb417ab70f1763e7002a2f6dc (patch) | |
| tree | 69c24bfdba59b727493941ffb59756ea2b9b9690 | |
| parent | ccf97ff1d1a305db5725916e770622f1806ee846 (diff) | |
| download | media-7e5fd2eed000640fb417ab70f1763e7002a2f6dc.tar.gz | |
Remove hardcoded LOCAL_MODULE_PATHS from vendor components. (media)
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: Ic909338aecff94e7970d6d33a9ba8ed1ba6a9aa3
| -rw-r--r-- | msm8998/libc2dcolorconvert/Android.mk | 3 | ||||
| -rw-r--r-- | msm8998/libstagefrighthw/Android.mk | 4 | ||||
| -rw-r--r-- | msm8998/mm-core/Android.mk | 6 | ||||
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/Android.mk | 6 | ||||
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/Android.mk | 6 |
5 files changed, 8 insertions, 17 deletions
diff --git a/msm8998/libc2dcolorconvert/Android.mk b/msm8998/libc2dcolorconvert/Android.mk index d5e51c2..2a8bfa3 100644 --- a/msm8998/libc2dcolorconvert/Android.mk +++ b/msm8998/libc2dcolorconvert/Android.mk @@ -18,8 +18,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libc2dcolorconvert -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr diff --git a/msm8998/libstagefrighthw/Android.mk b/msm8998/libstagefrighthw/Android.mk index bf253db..6fdf589 100644 --- a/msm8998/libstagefrighthw/Android.mk +++ b/msm8998/libstagefrighthw/Android.mk @@ -50,8 +50,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libstagefrighthw -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true include $(BUILD_SHARED_LIBRARY) - diff --git a/msm8998/mm-core/Android.mk b/msm8998/mm-core/Android.mk index 1a15372..ad36a85 100644 --- a/msm8998/mm-core/Android.mk +++ b/msm8998/mm-core/Android.mk @@ -98,8 +98,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libOmxCore LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := liblog libdl libcutils LOCAL_CFLAGS := $(OMXCORE_CFLAGS) @@ -128,8 +127,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libmm-omxcore LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := liblog libdl libcutils LOCAL_CFLAGS := $(OMXCORE_CFLAGS) diff --git a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk index 83cddef..a16bd7b 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/vdec/Android.mk @@ -112,8 +112,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libOmxVdec LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-vdec-def) -Werror LOCAL_C_INCLUDES += $(libmm-vdec-inc) LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-vdec-add-dep) @@ -145,8 +144,7 @@ ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VDEC)),true) LOCAL_MODULE := libOmxSwVdec LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-vdec-def) LOCAL_C_INCLUDES += $(libmm-vdec-inc) LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-vdec-add-dep) diff --git a/msm8998/mm-video-v4l2/vidc/venc/Android.mk b/msm8998/mm-video-v4l2/vidc/venc/Android.mk index 0047649..eb1587f 100644 --- a/msm8998/mm-video-v4l2/vidc/venc/Android.mk +++ b/msm8998/mm-video-v4l2/vidc/venc/Android.mk @@ -109,8 +109,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libOmxVenc LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-venc-def) LOCAL_C_INCLUDES := $(libmm-venc-inc) LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep) @@ -142,8 +141,7 @@ libmm-venc-inc += $(TARGET_OUT_HEADERS)/mm-video/swvenc LOCAL_MODULE := libOmxSwVencMpeg4 LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-venc-def) LOCAL_C_INCLUDES := $(libmm-venc-inc) LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep) |