From ff4c07f05b38450a0b6115e6357773f1570b4c81 Mon Sep 17 00:00:00 2001
From: Ilya Mizus <bigfatbrowncat@gmail.com>
Date: Fri, 21 Feb 2014 03:50:06 +0300
Subject: [PATCH] Changes to build on my libcore version

---
 makefile                  | 21 +++++++++------------
 src/classpath-android.cpp |  4 ++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/makefile b/makefile
index 0adfb9b2f8..9da379ddbe 100755
--- a/makefile
+++ b/makefile
@@ -173,8 +173,7 @@ ifneq ($(android),)
 		-DOS_SHARED_LIB_FORMAT_STR="\"$(so-prefix)%s$(so-suffix)\"" \
 		-DJNI_JARJAR_PREFIX= \
 		-D__DARWIN_UNIX03=1 \
-		-g3 \
-		-Werror
+		-g3
 
 	luni-cpps := $(shell find $(luni-native) -name '*.cpp')
 
@@ -183,7 +182,8 @@ ifneq ($(android),)
 		$(libnativehelper-native)/toStringArray.cpp
 
 	crypto-native := $(android)/libcore/crypto/src/main/native
-	crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
+	crypto-cpps := 
+	#$(crypto-native)/org_conscrypt_NativeCrypto.cpp
 
 	ifeq ($(platform),windows)
 		android-cflags += -D__STDC_CONSTANT_MACROS
@@ -193,17 +193,14 @@ ifneq ($(android),)
 		blacklist = $(luni-native)/java_io_Console.cpp \
 			$(luni-native)/java_lang_ProcessManager.cpp \
 			$(luni-native)/libcore_io_OsConstants.cpp \
-			$(luni-native)/libcore_io_Posix.cpp \
-			$(luni-native)/libcore_io_AsynchronousCloseMonitor.cpp \
 			$(luni-native)/libcore_net_RawSocket.cpp \
 			$(luni-native)/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp \
-			$(luni-native)/AsynchronousSocketCloseMonitor.cpp \
-			$(luni-native)/NetworkUtilities.cpp
+
 		luni-cpps := $(filter-out $(blacklist),$(luni-cpps))
 		icu-libs := $(android)/external/icu4c/lib/sicuin.a \
 			$(android)/external/icu4c/lib/sicuuc.a \
 			$(android)/external/icu4c/lib/sicudt.a
-		platform-lflags := -lgdi32
+		platform-lflags := -lgdi32 -lshell32
 	else
 		android-cflags += -fPIC -DHAVE_SYS_UIO_H
 		icu-libs := $(android)/external/icu4c/lib/libicui18n.a \
@@ -775,10 +772,10 @@ ifeq ($(platform),windows)
 		endif
 		cxx = x86_64-w64-mingw32-g++ $(mflag)
 		cc = x86_64-w64-mingw32-gcc $(mflag)
-		dlltool = x86_64-w64-mingw32-dlltool
-		ar = x86_64-w64-mingw32-ar
-		ranlib = x86_64-w64-mingw32-ranlib
-		strip = x86_64-w64-mingw32-strip
+		dlltool = dlltool
+		ar = ar
+		ranlib = ranlib
+		strip = strip
 		inc = "$(win64)/include"
 		lib = "$(win64)/lib"
 	else
diff --git a/src/classpath-android.cpp b/src/classpath-android.cpp
index 59d7bf3456..8d98c6f3f4 100644
--- a/src/classpath-android.cpp
+++ b/src/classpath-android.cpp
@@ -2307,8 +2307,8 @@ Avian_java_lang_System_mapLibraryName
 void register_java_io_Console(_JNIEnv*) { }
 void register_java_lang_ProcessManager(_JNIEnv*) { }
 void register_libcore_io_OsConstants(_JNIEnv*) { }
-void register_libcore_io_AsynchronousCloseMonitor(_JNIEnv*) { }
-void register_libcore_io_Posix(_JNIEnv*) { }
+//void register_libcore_io_AsynchronousCloseMonitor(_JNIEnv*) { }
+//void register_libcore_io_Posix(_JNIEnv*) { }
 void register_libcore_net_RawSocket(_JNIEnv*) { }
 void register_org_apache_harmony_xnet_provider_jsse_NativeCrypto(_JNIEnv*) { }