From 0dd86b11535d8db64c5a7409b1622d71bfbb21f6 Mon Sep 17 00:00:00 2001
From: Steve Gates <stgates@microsoft.com>
Date: Wed, 24 Jun 2015 10:41:21 -0700
Subject: [PATCH] Removing no longer needed files for building libiconv for
 Android.

---
 Build_android/libiconv/jni/Android.mk     | 23 -----------------------
 Build_android/libiconv/jni/Application.mk |  3 ---
 Build_android/libiconv/libiconv.patch     | 22 ----------------------
 3 files changed, 48 deletions(-)
 delete mode 100644 Build_android/libiconv/jni/Android.mk
 delete mode 100644 Build_android/libiconv/jni/Application.mk
 delete mode 100644 Build_android/libiconv/libiconv.patch

diff --git a/Build_android/libiconv/jni/Android.mk b/Build_android/libiconv/jni/Android.mk
deleted file mode 100644
index 005e604b41..0000000000
--- a/Build_android/libiconv/jni/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := iconv
-LOCAL_CFLAGS    := \
-    -Wno-multichar \
-    -D_ANDROID \
-    -DLIBDIR="\"c\"" \
-    -DBUILDING_LIBICONV \
-    -DIN_LIBRARY \
-    -Wno-static-in-inline \
-    -Wno-tautological-compare \
-    -Wno-parentheses-equality
-
-LOCAL_C_INCLUDES := \
-    ${LOCAL_PATH}/../libiconv-1.13.1 \
-    ${LOCAL_PATH}/../libiconv-1.13.1/include \
-    ${LOCAL_PATH}/../libiconv-1.13.1/lib \
-    ${LOCAL_PATH}/../libiconv-1.13.1/libcharset/include
-LOCAL_SRC_FILES := \
-    ../libiconv-1.13.1/lib/iconv.c \
-    ../libiconv-1.13.1/lib/relocatable.c \
-    ../libiconv-1.13.1/libcharset/lib/localcharset.c
-include $(BUILD_STATIC_LIBRARY)
diff --git a/Build_android/libiconv/jni/Application.mk b/Build_android/libiconv/jni/Application.mk
deleted file mode 100644
index 69145d7070..0000000000
--- a/Build_android/libiconv/jni/Application.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-NDK_TOOLCHAIN_VERSION := clang3.4
-APP_PLATFORM := android-9
-APP_ABI := armeabi-v7a x86
diff --git a/Build_android/libiconv/libiconv.patch b/Build_android/libiconv/libiconv.patch
deleted file mode 100644
index 60b7d1798a..0000000000
--- a/Build_android/libiconv/libiconv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --ignore-file-name-case -wuprN libiconv-1.13.1.orig/libcharset/lib/localcharset.c libiconv-1.13.1/libcharset/lib/localcharset.c
---- libiconv-1.13.1.orig/libcharset/lib/localcharset.c  2009-06-21 07:17:33.000000000 -0400
-+++ libiconv-1.13.1/libcharset/lib/localcharset.c       2012-12-18 10:20:27.000000000 -0500
-@@ -44,7 +44,7 @@
- # endif
- #endif
-
--#if !defined WIN32_NATIVE
-+#if !defined(WIN32_NATIVE) && !defined(__ANDROID__)
- # if HAVE_LANGINFO_CODESET
- #  include <langinfo.h>
- # else
-@@ -328,7 +328,7 @@ locale_charset (void)
-   const char *codeset;
-   const char *aliases;
-
--#if !(defined WIN32_NATIVE || defined OS2)
-+#if !(defined WIN32_NATIVE || defined OS2 || defined __ANDROID__)
-
- # if HAVE_LANGINFO_CODESET " > iconv.patch
-
-   $ patch -b -p0 < ./iconv.patch