diff options
| author | Ying Wang <wangying@google.com> | 2014-12-16 20:49:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 20:49:47 +0000 |
| commit | 4184bc65b955bf36580b99f65293be57588c3572 (patch) | |
| tree | 576dc008e504e23d6500252c8332602a9681d41d | |
| parent | d8bd84ac32c5770fdb0545649792122baab6506a (diff) | |
| parent | b24bd9a1958f4a7c6babdd9a5f43f27bb3ff9400 (diff) | |
| download | android_hardware_qcom_media-4184bc65b955bf36580b99f65293be57588c3572.tar.gz android_hardware_qcom_media-4184bc65b955bf36580b99f65293be57588c3572.tar.bz2 android_hardware_qcom_media-4184bc65b955bf36580b99f65293be57588c3572.zip | |
am b24bd9a1: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit 'b24bd9a1958f4a7c6babdd9a5f43f27bb3ff9400':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
| -rwxr-xr-x | mm-core/Android.mk | 2 | ||||
| -rwxr-xr-x | mm-video-legacy/DivxDrmDecrypt/Android.mk | 1 | ||||
| -rw-r--r-- | mm-video-legacy/vidc/vdec.mk | 3 | ||||
| -rw-r--r-- | mm-video-legacy/vidc/venc.mk | 3 | ||||
| -rwxr-xr-x | mm-video-v4l2/DivxDrmDecrypt/Android.mk | 1 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc.mk | 1 |
7 files changed, 0 insertions, 15 deletions
diff --git a/mm-core/Android.mk b/mm-core/Android.mk index 25fd9002..df156664 100755 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -79,7 +79,6 @@ LOCAL_COPY_HEADERS += inc/QCMetaData.h LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc -LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libOmxCore LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := liblog libdl @@ -103,7 +102,6 @@ include $(CLEAR_VARS) LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc -LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libmm-omxcore LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := liblog libdl diff --git a/mm-video-legacy/DivxDrmDecrypt/Android.mk b/mm-video-legacy/DivxDrmDecrypt/Android.mk index 26a2f7ad..ea439443 100755 --- a/mm-video-legacy/DivxDrmDecrypt/Android.mk +++ b/mm-video-legacy/DivxDrmDecrypt/Android.mk @@ -11,7 +11,6 @@ LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/inc \ $(TARGET_OUT_HEADERS)/mm-core/omxcore -LOCAL_PRELINK_MODULE:= false LOCAL_MODULE:= libdivxdrmdecrypt LOCAL_MODULE_TAGS := optional diff --git a/mm-video-legacy/vidc/vdec.mk b/mm-video-legacy/vidc/vdec.mk index acdc6260..478d2bc7 100644 --- a/mm-video-legacy/vidc/vdec.mk +++ b/mm-video-legacy/vidc/vdec.mk @@ -69,7 +69,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxVdec-def) LOCAL_C_INCLUDES += $(libmm-vdec-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt @@ -99,7 +98,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxVdec-def) LOCAL_C_INCLUDES := $(mm-vdec-test-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libutils liblog libOmxCore libOmxVdec libbinder LOCAL_SRC_FILES := vdec/src/queue.c @@ -119,7 +117,6 @@ LOCAL_MODULE := mm-video-driver-test LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxVdec-def) LOCAL_C_INCLUDES := $(mm-vdec-drv-test-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SRC_FILES := vdec/src/message_queue.c LOCAL_SRC_FILES += vdec/test/decoder_driver_test.c diff --git a/mm-video-legacy/vidc/venc.mk b/mm-video-legacy/vidc/venc.mk index 5092068c..052d4a66 100644 --- a/mm-video-legacy/vidc/venc.mk +++ b/mm-video-legacy/vidc/venc.mk @@ -59,7 +59,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libmm-venc-def) LOCAL_C_INCLUDES := $(libmm-venc-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \ libc2dcolorconvert libdl @@ -92,7 +91,6 @@ LOCAL_MODULE := mm-venc-omx-test720p LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libmm-venc-def) LOCAL_C_INCLUDES := $(mm-venc-test720p-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libmm-omxcore libOmxVenc libbinder LOCAL_SRC_FILES := venc/test/venc_test.cpp @@ -115,7 +113,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(venc-test-inc) LOCAL_C_INCLUDES += hardware/qcom/media/mm-core/inc -LOCAL_PRELINK_MODULE := false LOCAL_SRC_FILES := venc/test/video_encoder_test.c LOCAL_SRC_FILES += venc/test/queue.c diff --git a/mm-video-v4l2/DivxDrmDecrypt/Android.mk b/mm-video-v4l2/DivxDrmDecrypt/Android.mk index 38862260..28f5072c 100755 --- a/mm-video-v4l2/DivxDrmDecrypt/Android.mk +++ b/mm-video-v4l2/DivxDrmDecrypt/Android.mk @@ -18,7 +18,6 @@ LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/inc \ $(TARGET_OUT_HEADERS)/mm-core/omxcore -LOCAL_PRELINK_MODULE:= false LOCAL_MODULE:= libdivxdrmdecrypt LOCAL_MODULE_TAGS := optional diff --git a/mm-video-v4l2/vidc/vdec.mk b/mm-video-v4l2/vidc/vdec.mk index d59c3b82..98ac369f 100644 --- a/mm-video-v4l2/vidc/vdec.mk +++ b/mm-video-v4l2/vidc/vdec.mk @@ -108,7 +108,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxVdec-def) LOCAL_C_INCLUDES += $(libmm-vdec-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt @@ -151,7 +150,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxVdec-def) LOCAL_C_INCLUDES += $(libmm-vdec-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt @@ -186,7 +184,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxVdec-def) LOCAL_C_INCLUDES := $(mm-vdec-test-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libutils libOmxCore libOmxVdec libbinder libcutils LOCAL_SRC_FILES := vdec/src/queue.c @@ -207,7 +204,6 @@ LOCAL_MODULE := mm-video-driver-test LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxVdec-def) LOCAL_C_INCLUDES := $(mm-vdec-drv-test-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SRC_FILES := vdec/src/message_queue.c LOCAL_SRC_FILES += vdec/test/decoder_driver_test.c diff --git a/mm-video-v4l2/vidc/venc.mk b/mm-video-v4l2/vidc/venc.mk index 0d58872e..5c022a9e 100644 --- a/mm-video-v4l2/vidc/venc.mk +++ b/mm-video-v4l2/vidc/venc.mk @@ -93,7 +93,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libmm-venc-def) LOCAL_C_INCLUDES := $(libmm-venc-inc) -LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \ libc2dcolorconvert libdl libgui |
