author | Xindong Xu <xindong.xu@amlogic.com> | 2017-06-13 07:44:05 (GMT) |
---|---|---|
committer | Xindong Xu <xindong.xu@amlogic.com> | 2017-06-13 07:44:05 (GMT) |
commit | 01d3b87c1c4c96f45a3ba00ff171080703c44172 (patch) | |
tree | a41649103fb6a4d4b65236fca11aeb3e6a093be9 | |
parent | 28a80bbcef417e2d56240c0ecef263cb2711fc50 (diff) | |
download | media-01d3b87c1c4c96f45a3ba00ff171080703c44172.zip media-01d3b87c1c4c96f45a3ba00ff171080703c44172.tar.gz media-01d3b87c1c4c96f45a3ba00ff171080703c44172.tar.bz2 |
PD#145255: generate amlogic files to vendor/
Change-Id: I60d97ab2b17c1a60ed335b8ad470edca08166f11
-rw-r--r-- | amavutils/Android.mk | 15 | ||||
-rw-r--r-- | amavutils/tools/Android.mk | 4 | ||||
-rw-r--r-- | amcodec/Android.mk | 8 | ||||
-rw-r--r-- | amvdec/Android.mk | 8 | ||||
-rw-r--r-- | player/Android.mk | 3 |
5 files changed, 35 insertions, 3 deletions
diff --git a/amavutils/Android.mk b/amavutils/Android.mk index bf1152f..6dd0688 100644 --- a/amavutils/Android.mk +++ b/amavutils/Android.mk @@ -50,6 +50,9 @@ LOCAL_SHARED_LIBRARIES := \ libgui #LOCAL_SHARED_LIBRARIES += libandroid_runtime libnativehelper +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif LOCAL_MODULE := libamavutils LOCAL_MODULE_TAGS := optional @@ -101,7 +104,9 @@ LOCAL_SHARED_LIBRARIES := \ liblog #LOCAL_SHARED_LIBRARIES += libandroid_runtime libnativehelper - +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif LOCAL_MODULE := libamavutils LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm @@ -154,7 +159,9 @@ LOCAL_SHARED_LIBRARIES := \ libamavutils #LOCAL_SHARED_LIBRARIES += libandroid_runtime libnativehelper - +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif LOCAL_MODULE := libamavutils_alsa LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm @@ -206,7 +213,9 @@ LOCAL_SHARED_LIBRARIES := \ libgui #LOCAL_SHARED_LIBRARIES += libandroid_runtime libnativehelper - +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif LOCAL_MODULE := libamavutils_alsa LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm diff --git a/amavutils/tools/Android.mk b/amavutils/tools/Android.mk index 4f1e0e1..a1aa7cc 100644 --- a/amavutils/tools/Android.mk +++ b/amavutils/tools/Android.mk @@ -7,5 +7,9 @@ LOCAL_SRC_FILES := mediactl.cpp LOCAL_SHARED_LIBRARIES := liblog libcutils libmedia.amlogic.hal LOCAL_MODULE := mediactl LOCAL_MODULE_TAGS := optional + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif include $(BUILD_EXECUTABLE) diff --git a/amcodec/Android.mk b/amcodec/Android.mk index f81faae..fe14323 100644 --- a/amcodec/Android.mk +++ b/amcodec/Android.mk @@ -19,6 +19,10 @@ LOCAL_C_INCLUDES := \ LOCAL_ARM_MODE := arm #LOCAL_STATIC_LIBRARIES := libamadec LOCAL_MODULE:= libamcodec + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif include $(BUILD_STATIC_LIBRARY) @@ -53,4 +57,8 @@ LOCAL_ARM_MODE := arm LOCAL_MODULE:= libamcodec LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif include $(BUILD_SHARED_LIBRARY) diff --git a/amvdec/Android.mk b/amvdec/Android.mk index 0edee59..697fbeb 100644 --- a/amvdec/Android.mk +++ b/amvdec/Android.mk @@ -26,6 +26,10 @@ LOCAL_MODULE := libamvdec LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -54,4 +58,8 @@ LOCAL_MODULE := libamvdec LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_PRELINK_MODULE := false + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif include $(BUILD_SHARED_LIBRARY) diff --git a/player/Android.mk b/player/Android.mk index f5078ab..f99415b 100644 --- a/player/Android.mk +++ b/player/Android.mk @@ -19,4 +19,7 @@ else LOCAL_SHARED_LIBRARIES += libsystemwriteservice endif +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif include $(BUILD_EXECUTABLE) |