summaryrefslogtreecommitdiff
authorTellen Yu <tellen.yu@amlogic.com>2018-01-11 10:23:36 (GMT)
committer Tellen Yu <tellen.yu@amlogic.com>2018-01-12 02:50:31 (GMT)
commit121abe59b5d27c2ce54eb4eb2ee18ccff814bd9b (patch)
treee4097ab43c5dc0d30bd8ae51bc27a9623ab2b2d4
parent9469bc80c3ec7e3b586ec4d026894cd6f141c1f5 (diff)
downloadTvInput-121abe59b5d27c2ce54eb4eb2ee18ccff814bd9b.zip
TvInput-121abe59b5d27c2ce54eb4eb2ee18ccff814bd9b.tar.gz
TvInput-121abe59b5d27c2ce54eb4eb2ee18ccff814bd9b.tar.bz2
tvinput: add tv input to o-mr1 [8/11]
PD# 157786 add tvinput add for T962E/X Change-Id: I375861ae92cedcf35d444a3ec2baecf98d61d84f
Diffstat
-rw-r--r--DroidLogicTvInput/jni/Android.mk6
-rw-r--r--DroidLogicTvInput/jni/Fonts.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/DroidLogicTvInput/jni/Android.mk b/DroidLogicTvInput/jni/Android.mk
index d8e35f2..1477e74 100644
--- a/DroidLogicTvInput/jni/Android.mk
+++ b/DroidLogicTvInput/jni/Android.mk
@@ -80,7 +80,11 @@ LOCAL_MODULE := libjnifont
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := Fonts.cpp
LOCAL_ARM_MODE := arm
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
+LOCAL_C_INCLUDES := \
+ $(JNI_H_INCLUDE) \
+ libnativehelper/include_jni \
+ libnativehelper/include/nativehelper
+
LOCAL_SHARED_LIBRARIES += libvendorfont liblog libnativehelper libandroid_runtime libcutils
LOCAL_PRELINK_MODULE := false
diff --git a/DroidLogicTvInput/jni/Fonts.cpp b/DroidLogicTvInput/jni/Fonts.cpp
index f898121..2ba028a 100644
--- a/DroidLogicTvInput/jni/Fonts.cpp
+++ b/DroidLogicTvInput/jni/Fonts.cpp
@@ -3,7 +3,7 @@
#include "vendor_font_util.h"
#include "Fonts.h"
#include <utils/Log.h>
-#include <nativehelper/jni.h>
+#include <jni.h>
#include <nativehelper/JNIHelp.h>
#include <android_runtime/AndroidRuntime.h>