| author | Tellen Yu <tellen.yu@amlogic.com> | 2018-01-12 03:03:32 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2018-01-12 03:03:32 (GMT) |
| commit | 58456acf3585b996aed75474189e47839a9c749f (patch) | |
| tree | 4be203def3e0c2a0a0e07d7f5917fbabd17af971 | |
| parent | 1325c939db04eaacbf01c9c4999719da0e3bd200 (diff) | |
| parent | 121abe59b5d27c2ce54eb4eb2ee18ccff814bd9b (diff) | |
| download | TvInput-58456acf3585b996aed75474189e47839a9c749f.zip TvInput-58456acf3585b996aed75474189e47839a9c749f.tar.gz TvInput-58456acf3585b996aed75474189e47839a9c749f.tar.bz2 | |
Merge "tvinput: add tv input to o-mr1 [8/11]" into m-amlogic
| -rw-r--r-- | DroidLogicTvInput/jni/Android.mk | 6 | ||||
| -rw-r--r-- | DroidLogicTvInput/jni/Fonts.cpp | 2 |
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> |