summaryrefslogtreecommitdiff
authorKe Gong <ke.gong@amlogic.com>2015-04-08 07:22:22 (GMT)
committer Ke Gong <ke.gong@amlogic.com>2015-04-08 07:22:22 (GMT)
commita4346f51801b82d4779cc23f956b440bb7050458 (patch)
tree6fbf03bb043882b928411b2b991ea7763e5c21f5
parent5844dca2328c5823d156ba201015753bb28aa9a8 (diff)
downloadlibzvbi-a4346f51801b82d4779cc23f956b440bb7050458.zip
libzvbi-a4346f51801b82d4779cc23f956b440bb7050458.tar.gz
libzvbi-a4346f51801b82d4779cc23f956b440bb7050458.tar.bz2
PD #103476 Fix compiled error on Android L.
Squashed commit of the following: commit b21a724f78ded65827376fa644d784a75a2892fc Author: Ying Liu <ying.liu@amlogic.com> Date: Wed Apr 8 15:02:13 2015 +0800 PD #103476 Fix compiled error on Android L. Change-Id: I36122bec4bd3fd7dc892766bfbc30076ecac178b Change-Id: I031aaf6925135659e4c1ab650704a1336e7e5a2f
Diffstat
-rwxr-xr-xAndroid.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 6d16e7c..27836c1 100755
--- a/Android.mk
+++ b/Android.mk
@@ -11,7 +11,9 @@ LOCAL_SRC_FILES := src/bit_slicer.c src/cache.c src/caption.c src/conv.c src/dvb
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
LOCAL_ARM_MODE := arm
-LOCAL_C_INCLUDES := external/icu4c/common
+LOCAL_C_INCLUDES := external/icu4c/common\
+ external/icu/icu4c/source/common
+
LOCAL_SHARED_LIBRARIES += libicuuc liblog