summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2017-05-31 06:49:23 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2017-06-02 02:21:41 (GMT)
commitfe4b12da045c4e647db7c15729a51ba4f4aeeb88 (patch)
tree0a289c1ec2aca56020700e85d9b69a07a43f2aa4
parent1ad9040ebcecaa23b93254121937ad074255f48c (diff)
downloadlibzvbi-ref-o-20171115.zip
libzvbi-ref-o-20171115.tar.gz
libzvbi-ref-o-20171115.tar.bz2
PD#145255: generate amlogic files to vendor/
Change-Id: I9e915971c9688c85e7da88aebe701acf335153ca
Diffstat
-rw-r--r--Android.mk4
-rw-r--r--[-rwxr-xr-x]ntsc_decode/Android.mk17
2 files changed, 14 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index 754ec5a..9caaf2d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,10 @@ LOCAL_SHARED_LIBRARIES += libicuuc liblog
LOCAL_PRELINK_MODULE := false
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
include $(BUILD_SHARED_LIBRARY)
include $(LOCAL_PATH)/ntsc_decode/Android.mk
#include $(LOCAL_PATH)/test/Android.mk
diff --git a/ntsc_decode/Android.mk b/ntsc_decode/Android.mk
index 6eedb12..cca0b91 100755..100644
--- a/ntsc_decode/Android.mk
+++ b/ntsc_decode/Android.mk
@@ -4,18 +4,21 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:=am_vbi.c \
sliced_vbi.c \
ntsc_dmx/am_vbi_dmx.c \
- ntsc_dmx/linux_vbi/linux_ntsc.c
-
-LOCAL_SHARED_LIBRARIES+= libzvbi
+ ntsc_dmx/linux_vbi/linux_ntsc.c
+
+LOCAL_SHARED_LIBRARIES+= libzvbi
LOCAL_C_INCLUDES:=$(LOCAL_PATH)/../src \
$(LOCAL_PATH)/include/ \
- $(LOCAL_PATH)/include/ntsc_dmx/
-
-
+ $(LOCAL_PATH)/include/ntsc_dmx/
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
LOCAL_MODULE:= libntsc_decode
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_CFLAGS+=-D_REENTRANT -D_GNU_SOURCE -DENABLE_DVB=1 -DENABLE_V4L=1 -DENABLE_V4L2=1 -DHAVE_ICONV=1 -DPACKAGE=\"zvbi\" -DVERSION=\"0.2.33\" -DANDROID -DHAVE_GETOPT_LONG=1
LOCAL_SHARED_LIBRARIES += libicuuc liblog
-include $(BUILD_SHARED_LIBRARY) \ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)