summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2017-03-22 20:43:05 +0900
committermicky387 <mickaelsaibi@free.fr>2017-11-08 19:51:43 +0100
commitf1394398d2c0ae07fe09168076ee64aad7327ca1 (patch)
tree5aff65b2f5d445824ca813152af6c17b2fb49e0b
parent16580d756b5c39f6f6bff4635a0363233e047956 (diff)
downloadandroid_hardware_qcom_media-f1394398d2c0ae07fe09168076ee64aad7327ca1.tar.gz
android_hardware_qcom_media-f1394398d2c0ae07fe09168076ee64aad7327ca1.tar.bz2
android_hardware_qcom_media-f1394398d2c0ae07fe09168076ee64aad7327ca1.zip
Move QCOM mm codecs to vendor partitionlineage-15.0-caf-8084
Bug: 36500740 Test: camcorder recording, video play should work as before. libOmxVdec.so and libOmxVenc.so should be loaded into the media codec process. Change-Id: Id6e349645adc0be3a4873afc1812679f0e710b0b
-rw-r--r--libc2dcolorconvert/Android.mk2
-rw-r--r--libstagefrighthw/Android.mk2
-rw-r--r--mm-core/Android.mk2
-rw-r--r--mm-video-v4l2/vidc/test/Android.mk1
-rw-r--r--mm-video-v4l2/vidc/vdec/Android.mk4
-rw-r--r--mm-video-v4l2/vidc/venc/Android.mk3
-rw-r--r--videopp/Android.mk1
7 files changed, 15 insertions, 0 deletions
diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk
index 53cebe0f..d8cf18b3 100644
--- a/libc2dcolorconvert/Android.mk
+++ b/libc2dcolorconvert/Android.mk
@@ -21,4 +21,6 @@ LOCAL_MODULE := libc2dcolorconvert
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_PROPRIETARY_MODULE := true
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index 01c1caa9..89999faa 100644
--- a/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
@@ -43,5 +43,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE := libstagefrighthw
+LOCAL_PROPRIETARY_MODULE := true
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index ed4b01a5..863f6088 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -78,6 +78,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libOmxCore
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE:= true
LOCAL_SHARED_LIBRARIES := liblog libdl
LOCAL_CFLAGS := $(OMXCORE_CFLAGS)
@@ -98,6 +99,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libmm-omxcore
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE:= true
LOCAL_SHARED_LIBRARIES := liblog libdl
LOCAL_CFLAGS := $(OMXCORE_CFLAGS)
diff --git a/mm-video-v4l2/vidc/test/Android.mk b/mm-video-v4l2/vidc/test/Android.mk
index ca904b7e..86ef5a37 100644
--- a/mm-video-v4l2/vidc/test/Android.mk
+++ b/mm-video-v4l2/vidc/test/Android.mk
@@ -10,4 +10,5 @@ LOCAL_SRC_FILES += queue.c
LOCAL_SRC_FILES += ring_queue.c
LOCAL_CFLAGS := -DLOG_TAG=\"MSM-VIDC-TEST\"
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
include $(BUILD_EXECUTABLE)
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 745b69c1..02a32500 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -144,6 +144,7 @@ endif
LOCAL_MODULE := libOmxVdec
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(libOmxVdec-def)
LOCAL_C_INCLUDES += $(libmm-vdec-inc)
@@ -185,6 +186,7 @@ ifneq (,$(filter msm8974 msm8610 msm8226 msm_bronze msm8916,$(TARGET_BOARD_PLATF
LOCAL_MODULE := libOmxVdecHevc
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(libOmxVdec-def)
LOCAL_C_INCLUDES += $(libmm-vdec-inc)
@@ -227,6 +229,7 @@ mm-vdec-test-inc += $(vdec-inc)
LOCAL_MODULE := mm-vdec-omx-test
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(libOmxVdec-def)
LOCAL_C_INCLUDES := $(mm-vdec-test-inc)
@@ -250,6 +253,7 @@ mm-vdec-drv-test-inc += $(vdec-inc)
LOCAL_MODULE := mm-video-driver-test
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(libOmxVdec-def)
LOCAL_C_INCLUDES := $(mm-vdec-drv-test-inc)
LOCAL_PRELINK_MODULE := false
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 3762f550..e7df913b 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -109,6 +109,7 @@ libmm-venc-inc += $(venc-inc)
LOCAL_MODULE := libOmxVenc
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(libmm-venc-def)
LOCAL_C_INCLUDES := $(libmm-venc-inc)
@@ -145,6 +146,7 @@ mm-venc-test720p-inc += $(venc-inc)
LOCAL_MODULE := mm-venc-omx-test720p
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(libmm-venc-def)
LOCAL_C_INCLUDES := $(mm-venc-test720p-inc)
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
@@ -170,6 +172,7 @@ venc-test-inc += $(venc-inc)
LOCAL_MODULE := mm-video-encdrv-test
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_C_INCLUDES := $(venc-test-inc)
LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/mm-core/inc
diff --git a/videopp/Android.mk b/videopp/Android.mk
index d85fd8f3..40d4ce51 100644
--- a/videopp/Android.mk
+++ b/videopp/Android.mk
@@ -54,6 +54,7 @@ libmm-vidpp-inc += frameworks/av/include/media/stagefright
LOCAL_MODULE := libOmxVdpp
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(libOmxVdpp-def)
LOCAL_C_INCLUDES += $(libmm-vidpp-inc)