replace iconv with am_iconv.h

6 files changed, 8 insertions, 20 deletions

diff --git a/Android.mk b/Android.mk
index 220b6e0..df10b2c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,15 +9,13 @@ LOCAL_SRC_FILES := src/bit_slicer.c src/cache.c src/caption.c src/conv.c src/dvb
 	src/pfc_demux.c src/proxy-client.c src/raw_decoder.c src/sampling_par.c src/search.c src/ure.c src/sliced_filter.c \
 	src/tables.c src/trigger.c src/vbi.c src/vps.c src/wss.c src/xds_demux.c src/decoder.c src/dtvcc.c
 
-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\"
+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 := $(LOCAL_PATH)/../dvb/android/ex_include
+LOCAL_C_INCLUDES := external/dvb/include/am_adp\
+	external/icu4c/common
 
-LOCAL_SHARED_LIBRARIES +=
-LOCAL_STATIC_LIBRARIES += libiconv liblog
+LOCAL_SHARED_LIBRARIES += libicuuc liblog
 
 LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_SHARED_LIBRARY)
-
-include $(LOCAL_PATH)/../dvb/android/ex_lib/Android.mk
diff --git a/log b/log
deleted file mode 100644
index ca1d79c..0000000
--- a/log
+++ b/dev/null
@@ -1,10 +0,0 @@
-build/core/main.mk:42: ********************************************************************************
-build/core/main.mk:43: *  You are using version 3.82 of make.
-build/core/main.mk:44: *  Android can only be built by version 3.81.
-build/core/main.mk:45: *  see http://source.android.com/source/download.html
-build/core/main.mk:46: ********************************************************************************
-external/zvbi-0.2.33/src/dtvcc.c: In function 'tvcc_decode_data':
-external/zvbi-0.2.33/src/dtvcc.c:3418: error: 'pr' undeclared (first use in this function)
-external/zvbi-0.2.33/src/dtvcc.c:3418: error: (Each undeclared identifier is reported only once
-external/zvbi-0.2.33/src/dtvcc.c:3418: error: for each function it appears in.)
-make: *** [out/target/product/f16ref/obj/SHARED_LIBRARIES/libam_adp_intermediates/src/dtvcc.o] Error 1
diff --git a/src/conv.c b/src/conv.c
index b5aa813..b950ec4 100644
--- a/src/conv.c
+++ b/src/conv.c
@@ -38,7 +38,7 @@
 
 #ifdef HAVE_ICONV
 
-#  include <iconv.h>
+#  include <am_iconv.h>
 
 struct _vbi_iconv_t {
 	iconv_t			icd;
diff --git a/src/exp-html.c b/src/exp-html.c
index fe2be09..42c08ce 100644
--- a/src/exp-html.c
+++ b/src/exp-html.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#include <iconv.h>
+#include <am_iconv.h>
 
 #include "lang.h"
 #include "export.h"
diff --git a/src/exp-txt.c b/src/exp-txt.c
index 58937b4..f4f0775 100644
--- a/src/exp-txt.c
+++ b/src/exp-txt.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <limits.h>
-#include <iconv.h>
+#include <am_iconv.h>
 
 #include "misc.h"
 #include "lang.h"
diff --git a/src/export.c b/src/export.c
index c9653ed..54fbda3 100644
--- a/src/export.c
+++ b/src/export.c
@@ -34,7 +34,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <iconv.h>
+#include <am_iconv.h>
 
 #include "export.h"
 #include "conv.h"