From 66edf1ff4a5c1c5dbf96cb5a301e117c8f264c28 Mon Sep 17 00:00:00 2001
From: Ilya Mizus <bigfatbrowncat@gmail.com>
Date: Fri, 4 Apr 2014 20:21:16 +0400
Subject: [PATCH] Fix for https://github.com/ReadyTalk/avian/issues/216

---
 makefile                  |  2 +-
 src/classpath-android.cpp | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/makefile b/makefile
index 8aba1ebd78..b2ce3253cf 100755
--- a/makefile
+++ b/makefile
@@ -163,7 +163,7 @@ ifneq ($(android),)
 	classpath-jar-dep = $(build)/android.dep
 	luni-native = $(android)/libcore/luni/src/main/native
 	classpath-cflags = -DBOOT_JAVAHOME
-	android-cflags := -I$(luni-native) \
+	android-cflags = -I$(luni-native) \
 		-I$(android)/libnativehelper/include/nativehelper \
 		-I$(android)/system/core/include \
 		-I$(android)/external/zlib \
diff --git a/src/classpath-android.cpp b/src/classpath-android.cpp
index 8297a3cc9c..94ca59b9e7 100644
--- a/src/classpath-android.cpp
+++ b/src/classpath-android.cpp
@@ -2334,22 +2334,6 @@ Avian_java_lang_System_identityHashCode
   return objectHash(t, reinterpret_cast<object>(arguments[0]));
 }
 
-extern "C" AVIAN_EXPORT int64_t JNICALL
-Avian_java_lang_System_mapLibraryName
-(Thread* t, object, uintptr_t* arguments)
-{
-  object original = reinterpret_cast<object>(arguments[0]);
-  unsigned originalLength = stringUTFLength(t, original);
-  THREAD_RUNTIME_ARRAY(t, char, originalChars, originalLength);
-  stringUTFChars
-    (t, original, RUNTIME_ARRAY_BODY(originalChars), originalLength);
-
-  return reinterpret_cast<uintptr_t>
-    (makeString(t, "%s%.*s%s", t->m->system->libraryPrefix(), originalLength,
-                RUNTIME_ARRAY_BODY(originalChars),
-                t->m->system->librarySuffix()));
-}
-
 extern "C" AVIAN_EXPORT int64_t JNICALL
 Avian_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8
 (Thread*, object, uintptr_t*)