summaryrefslogtreecommitdiff
authorTellen Yu <tellen.yu@amlogic.com>2018-01-13 07:57:20 (GMT)
committer Gerrit Code Review <gituser@scgit.amlogic.com>2018-01-13 07:57:20 (GMT)
commit41e91ce7574343824581059e5a8ebcfd3c075b19 (patch)
tree64fc660f5655eacf3cca79c0395274558b874b39
parent3f8271f3fa35db6be3c97179134773d67b3369b6 (diff)
parent52fcb298b268c1c0e0567a9ff966d5c84d67177a (diff)
downloadTvInput-41e91ce7574343824581059e5a8ebcfd3c075b19.zip
TvInput-41e91ce7574343824581059e5a8ebcfd3c075b19.tar.gz
TvInput-41e91ce7574343824581059e5a8ebcfd3c075b19.tar.bz2
Merge "TvInput: change vendor/amlogic to BOARD_AML_VENDOR_PATH [5/10]" into m-amlogic
Diffstat
-rw-r--r--DroidLogicTvInput/jni/Android.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/DroidLogicTvInput/jni/Android.mk b/DroidLogicTvInput/jni/Android.mk
index 1477e74..9eab4d1 100644
--- a/DroidLogicTvInput/jni/Android.mk
+++ b/DroidLogicTvInput/jni/Android.mk
@@ -2,9 +2,15 @@ LOCAL_PATH := $(call my-dir)
DVB_PATH := $(wildcard external/dvb)
ifeq ($(DVB_PATH), )
+ DVB_PATH := $(wildcard $(BOARD_AML_VENDOR_PATH)/external/dvb)
+endif
+ifeq ($(DVB_PATH), )
DVB_PATH := $(wildcard vendor/amlogic/external/dvb)
endif
ifeq ($(DVB_PATH), )
+ DVB_PATH := $(wildcard $(BOARD_AML_VENDOR_PATH)/dvb)
+endif
+ifeq ($(DVB_PATH), )
DVB_PATH := $(wildcard vendor/amlogic/dvb)
endif
@@ -22,7 +28,8 @@ LOCAL_C_INCLUDES := external/libzvbi/src \
bionic/libc/include \
external/skia/include\
$(DVB_PATH)/android/ndk/include \
- vendor/amlogic/external/libzvbi/src
+ vendor/amlogic/external/libzvbi/src \
+ $(BOARD_AML_VENDOR_PATH)/external/libzvbi/src
LOCAL_SHARED_LIBRARIES += libjnigraphics libzvbi libam_mw libam_adp libskia liblog libcutils