From ff4c07f05b38450a0b6115e6357773f1570b4c81 Mon Sep 17 00:00:00 2001 From: Ilya Mizus Date: Fri, 21 Feb 2014 03:50:06 +0300 Subject: [PATCH 01/14] 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*) { } From 66f25193dffcaf27e64c4b1b066a1d13f2173e95 Mon Sep 17 00:00:00 2001 From: Ilya Mizus Date: Fri, 21 Feb 2014 23:14:07 +0300 Subject: [PATCH 02/14] OsConstants removed from blacklist --- makefile | 1 - src/classpath-android.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/makefile b/makefile index 9da379ddbe..443885633c 100755 --- a/makefile +++ b/makefile @@ -192,7 +192,6 @@ ifneq ($(android),) endif blacklist = $(luni-native)/java_io_Console.cpp \ $(luni-native)/java_lang_ProcessManager.cpp \ - $(luni-native)/libcore_io_OsConstants.cpp \ $(luni-native)/libcore_net_RawSocket.cpp \ $(luni-native)/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp \ diff --git a/src/classpath-android.cpp b/src/classpath-android.cpp index 8d98c6f3f4..1be58c7b01 100644 --- a/src/classpath-android.cpp +++ b/src/classpath-android.cpp @@ -2306,7 +2306,7 @@ 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_OsConstants(_JNIEnv*) { } //void register_libcore_io_AsynchronousCloseMonitor(_JNIEnv*) { } //void register_libcore_io_Posix(_JNIEnv*) { } void register_libcore_net_RawSocket(_JNIEnv*) { } From 4184c8313a1758a77287fd75e1ba12fc96a2b073 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Wed, 26 Feb 2014 02:35:54 +0400 Subject: [PATCH 03/14] Adding Eclipse workspace to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 84786ef46a..d6ded73b97 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ bin *.pdb *.swp /*.sublime-* +workspace/ +src/.cproject From a2ff617f1e7f4ee67c7a77397f4f74a00c2d79da Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Wed, 26 Feb 2014 03:24:10 +0400 Subject: [PATCH 04/14] Adding a workaround for read-only Enum.java during build --- makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/makefile b/makefile index f766ab5320..8c2ed00e91 100755 --- a/makefile +++ b/makefile @@ -1593,6 +1593,10 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \ @mkdir -p $(build)/android-src/libexpat cp $(android)/external/fdlibm/fdlibm.h $(build)/android-src/external/fdlibm/ cp $(android)/external/expat/lib/expat*.h $(build)/android-src/libexpat/ + if [ -a $(build)/android-src/java/lang/Enum.java ] ; \ + then \ + chmod +w $(build)/android-src/java/lang/Enum.java ; \ + fi; cp -a $(luni-java)/* $(libdvm-java)/* $(crypto-java)/* $(dalvik-java)/* \ $(xml-java)/* $(build)/android-src/ sed -i -e 's/return ordinal - o.ordinal;/return ordinal - o.ordinal();/' \ From e217a4faf8be1c3d80c9b55d1f9b7b67ec644caf Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Wed, 26 Feb 2014 03:35:05 +0400 Subject: [PATCH 05/14] Removing workaround for Enum.java, fixing the root cause of the issue --- makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 8c2ed00e91..8c2ab0ba5c 100755 --- a/makefile +++ b/makefile @@ -1593,14 +1593,12 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \ @mkdir -p $(build)/android-src/libexpat cp $(android)/external/fdlibm/fdlibm.h $(build)/android-src/external/fdlibm/ cp $(android)/external/expat/lib/expat*.h $(build)/android-src/libexpat/ - if [ -a $(build)/android-src/java/lang/Enum.java ] ; \ - then \ - chmod +w $(build)/android-src/java/lang/Enum.java ; \ - fi; cp -a $(luni-java)/* $(libdvm-java)/* $(crypto-java)/* $(dalvik-java)/* \ $(xml-java)/* $(build)/android-src/ sed -i -e 's/return ordinal - o.ordinal;/return ordinal - o.ordinal();/' \ $(build)/android-src/java/lang/Enum.java + # sed makes this file read-only which in turn breaks re-builds; so marking it as writable + chmod +w $(build)/android-src/java/lang/Enum.java find $(build)/android-src -name '*.java' > $(build)/android.txt $(javac) -Xmaxerrs 1000 -d $(build)/android -sourcepath $(luni-java) \ @$(build)/android.txt From 63a691f41d98a42e4a87e03e299be7b9a6f91821 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Wed, 26 Feb 2014 19:41:55 +0400 Subject: [PATCH 06/14] Adding a define to tell Android Classpath to disable IPv6, removing -fPIC on Windows as it's useless there and generates warnings --- makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/makefile b/makefile index 8c2ab0ba5c..95f1fc35dc 100755 --- a/makefile +++ b/makefile @@ -179,6 +179,7 @@ ifneq ($(android),) -DOS_SHARED_LIB_FORMAT_STR="\"$(so-prefix)%s$(so-suffix)\"" \ -DJNI_JARJAR_PREFIX= \ -D__DARWIN_UNIX03=1 \ + -D__DISABLE_IPV6_PROTO \ -g3 luni-cpps := $(shell find $(luni-native) -name '*.cpp') @@ -193,9 +194,6 @@ ifneq ($(android),) ifeq ($(platform),windows) android-cflags += -D__STDC_CONSTANT_MACROS - ifneq ($(arch),i386) - android-cflags += -fPIC - endif blacklist = $(luni-native)/java_io_Console.cpp \ $(luni-native)/java_lang_ProcessManager.cpp \ $(luni-native)/libcore_net_RawSocket.cpp \ From 6df337b0c432516b74b93226a8362f25aaa56666 Mon Sep 17 00:00:00 2001 From: Ilya Mizus Date: Thu, 27 Feb 2014 01:56:17 +0300 Subject: [PATCH 07/14] Added errno descriptions for Android classpath on Windows --- src/classpath-android.cpp | 137 +++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/src/classpath-android.cpp b/src/classpath-android.cpp index 8f2b596f2f..5eb2d7049f 100644 --- a/src/classpath-android.cpp +++ b/src/classpath-android.cpp @@ -23,6 +23,10 @@ extern "C" int JNI_OnLoad(JavaVM*, void*); #include "avian/classpath-common.h" #include "avian/process.h" +#ifdef PLATFORM_WINDOWS +#include +#endif + using namespace vm; extern "C" AVIAN_EXPORT int64_t JNICALL @@ -801,6 +805,137 @@ setField(Thread* t, object field, object instance, object value) namespace vm { +#ifdef PLATFORM_WINDOWS +const char* getErrnoDescription(int err) +{ + switch (err) { + + // EACCES + case EACCES: + return "Permission denied"; + + case EFAULT: + return "Bad address"; + + // EINTR + case EINTR: + return "Interrupted function call"; + + // EINVAL + case EINVAL: + return "Invalid argument"; + + // EBADF + case EBADF: + return "File handle is not valid"; + + // EMFILE + case EMFILE: + return "Too many open files"; + + // EWOULDBLOCK + case EWOULDBLOCK: + return "Resource temporarily unavailable"; + + // EINPROGRESS + case EINPROGRESS: + return "Operation now in progress"; + + // EALREADY + case EALREADY: + return "Operation already in progress"; + + // ENOTSOCK + case ENOTSOCK: + return "Socket operation on nonsocket"; + + // EDESTADDRREQ + case EDESTADDRREQ: + return "Destination address required"; + + // EMSGSIZE + case EMSGSIZE: + return "Message too long"; + + // EPROTOTYPE + case EPROTOTYPE: + return "Protocol wrong type for socket"; + + // ENOPROTOOPT + case ENOPROTOOPT: + return "Bad protocol option"; + + // EPROTONOSUPPORT + case EPROTONOSUPPORT: + return "Protocol not supported"; + + // EOPNOTSUPP + case EOPNOTSUPP: + return "Operation not supported"; + + // EAFNOSUPPORT + case EAFNOSUPPORT: + return "Address family not supported by protocol family"; + + // EADDRINUSE + case EADDRINUSE: + return "Address already in use"; + + // EADDRNOTAVAIL + case EADDRNOTAVAIL: + return "Cannot assign requested address"; + + // ENETDOWN + case ENETDOWN: + return "Network is down"; + + // ENETUNREACH + case ENETUNREACH: + return "Network is unreachable"; + + // ENETRESET + case ENETRESET: + return "Network dropped connection on reset"; + + // ECONNABORTED + case ECONNABORTED: + return "Software caused connection abort"; + + // ECONNRESET + case ECONNRESET: + return "Connection reset by peer"; + + // ENOBUFS + case ENOBUFS: + return "No buffer space available"; + + // EISCONN + case EISCONN: + return "Socket is already connected"; + + // ENOTCONN + case ENOTCONN: + return "Socket is not connected"; + + // ETIMEDOUT + case ETIMEDOUT: + return "Connection timed out"; + + // ECONNREFUSED + case ECONNREFUSED: + return "Connection refused"; + + // EHOSTUNREACH + case EHOSTUNREACH: + return "No route to host"; + + default: + return "Undescribed error"; + } +} +#endif + + Classpath* makeClasspath(System*, Allocator* allocator, const char*, const char*) { @@ -875,7 +1010,7 @@ extern "C" const char* jniStrError(int error, char* buffer, size_t length) { #ifdef PLATFORM_WINDOWS - const char* s = strerror(error); + const char* s = getErrnoDescription(error); if (strlen(s) < length) { strncpy(buffer, s, length); return buffer; From 301fb1ae1361382836ed70ca0665c8a5118e9016 Mon Sep 17 00:00:00 2001 From: Ilya Mizus Date: Fri, 28 Feb 2014 11:18:48 +0400 Subject: [PATCH 08/14] Refactoring --- src/classpath-android.cpp | 133 +------------------------------------- 1 file changed, 1 insertion(+), 132 deletions(-) diff --git a/src/classpath-android.cpp b/src/classpath-android.cpp index 5eb2d7049f..854fd92ee8 100644 --- a/src/classpath-android.cpp +++ b/src/classpath-android.cpp @@ -24,7 +24,7 @@ extern "C" int JNI_OnLoad(JavaVM*, void*); #include "avian/process.h" #ifdef PLATFORM_WINDOWS -#include +const char* getErrnoDescription(int err); // This function is defined in mingw-extensions.cpp #endif using namespace vm; @@ -805,137 +805,6 @@ setField(Thread* t, object field, object instance, object value) namespace vm { -#ifdef PLATFORM_WINDOWS -const char* getErrnoDescription(int err) -{ - switch (err) { - - // EACCES - case EACCES: - return "Permission denied"; - - case EFAULT: - return "Bad address"; - - // EINTR - case EINTR: - return "Interrupted function call"; - - // EINVAL - case EINVAL: - return "Invalid argument"; - - // EBADF - case EBADF: - return "File handle is not valid"; - - // EMFILE - case EMFILE: - return "Too many open files"; - - // EWOULDBLOCK - case EWOULDBLOCK: - return "Resource temporarily unavailable"; - - // EINPROGRESS - case EINPROGRESS: - return "Operation now in progress"; - - // EALREADY - case EALREADY: - return "Operation already in progress"; - - // ENOTSOCK - case ENOTSOCK: - return "Socket operation on nonsocket"; - - // EDESTADDRREQ - case EDESTADDRREQ: - return "Destination address required"; - - // EMSGSIZE - case EMSGSIZE: - return "Message too long"; - - // EPROTOTYPE - case EPROTOTYPE: - return "Protocol wrong type for socket"; - - // ENOPROTOOPT - case ENOPROTOOPT: - return "Bad protocol option"; - - // EPROTONOSUPPORT - case EPROTONOSUPPORT: - return "Protocol not supported"; - - // EOPNOTSUPP - case EOPNOTSUPP: - return "Operation not supported"; - - // EAFNOSUPPORT - case EAFNOSUPPORT: - return "Address family not supported by protocol family"; - - // EADDRINUSE - case EADDRINUSE: - return "Address already in use"; - - // EADDRNOTAVAIL - case EADDRNOTAVAIL: - return "Cannot assign requested address"; - - // ENETDOWN - case ENETDOWN: - return "Network is down"; - - // ENETUNREACH - case ENETUNREACH: - return "Network is unreachable"; - - // ENETRESET - case ENETRESET: - return "Network dropped connection on reset"; - - // ECONNABORTED - case ECONNABORTED: - return "Software caused connection abort"; - - // ECONNRESET - case ECONNRESET: - return "Connection reset by peer"; - - // ENOBUFS - case ENOBUFS: - return "No buffer space available"; - - // EISCONN - case EISCONN: - return "Socket is already connected"; - - // ENOTCONN - case ENOTCONN: - return "Socket is not connected"; - - // ETIMEDOUT - case ETIMEDOUT: - return "Connection timed out"; - - // ECONNREFUSED - case ECONNREFUSED: - return "Connection refused"; - - // EHOSTUNREACH - case EHOSTUNREACH: - return "No route to host"; - - default: - return "Undescribed error"; - } -} -#endif - - Classpath* makeClasspath(System*, Allocator* allocator, const char*, const char*) { From 6ae149809fa160a163f5629b40e9dde9146046f0 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Tue, 4 Mar 2014 00:41:58 +0400 Subject: [PATCH 09/14] Enabled "FIXME_STUB" macro --- makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/makefile b/makefile index 95f1fc35dc..78fd3d7462 100755 --- a/makefile +++ b/makefile @@ -180,6 +180,7 @@ ifneq ($(android),) -DJNI_JARJAR_PREFIX= \ -D__DARWIN_UNIX03=1 \ -D__DISABLE_IPV6_PROTO \ + -D__PROVIDE_FIXMES \ -g3 luni-cpps := $(shell find $(luni-native) -name '*.cpp') From 33a48afd178d4e59e457567b6460bb01aada907b Mon Sep 17 00:00:00 2001 From: Ilya Mizus Date: Wed, 5 Mar 2014 01:33:41 +0400 Subject: [PATCH 10/14] NativeCrypto is back for non-Windows platforms --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 78fd3d7462..efc08f9e0a 100755 --- a/makefile +++ b/makefile @@ -190,10 +190,9 @@ ifneq ($(android),) $(libnativehelper-native)/toStringArray.cpp crypto-native := $(android)/libcore/crypto/src/main/native - crypto-cpps := - #$(crypto-native)/org_conscrypt_NativeCrypto.cpp ifeq ($(platform),windows) + crypto-cpps := android-cflags += -D__STDC_CONSTANT_MACROS blacklist = $(luni-native)/java_io_Console.cpp \ $(luni-native)/java_lang_ProcessManager.cpp \ @@ -206,6 +205,7 @@ ifneq ($(android),) $(android)/external/icu4c/lib/sicudt.a platform-lflags := -lgdi32 -lshell32 else + crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp android-cflags += -fPIC -DHAVE_SYS_UIO_H icu-libs := $(android)/external/icu4c/lib/libicui18n.a \ $(android)/external/icu4c/lib/libicuuc.a \ From 0982debca71a385ff53d68f4d948e12c016aa46e Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Wed, 5 Mar 2014 03:02:48 +0400 Subject: [PATCH 11/14] Got rid of __DISABLE_IPV6_PROTO macro --- makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/makefile b/makefile index 78fd3d7462..be107f5fcb 100755 --- a/makefile +++ b/makefile @@ -179,7 +179,6 @@ ifneq ($(android),) -DOS_SHARED_LIB_FORMAT_STR="\"$(so-prefix)%s$(so-suffix)\"" \ -DJNI_JARJAR_PREFIX= \ -D__DARWIN_UNIX03=1 \ - -D__DISABLE_IPV6_PROTO \ -D__PROVIDE_FIXMES \ -g3 From 57f50ca7ea4fe5a2f60b64c331d1e5a2fc8186be Mon Sep 17 00:00:00 2001 From: Ilya Mizus Date: Thu, 6 Mar 2014 18:33:23 +0400 Subject: [PATCH 12/14] Some small cleanup before pull request --- makefile | 13 +++++++------ src/classpath-android.cpp | 3 --- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/makefile b/makefile index 1dca10bdcf..35ebf7abf9 100755 --- a/makefile +++ b/makefile @@ -180,7 +180,8 @@ ifneq ($(android),) -DJNI_JARJAR_PREFIX= \ -D__DARWIN_UNIX03=1 \ -D__PROVIDE_FIXMES \ - -g3 + -g3 \ + -Werror luni-cpps := $(shell find $(luni-native) -name '*.cpp') @@ -202,7 +203,7 @@ ifneq ($(android),) icu-libs := $(android)/external/icu4c/lib/sicuin.a \ $(android)/external/icu4c/lib/sicuuc.a \ $(android)/external/icu4c/lib/sicudt.a - platform-lflags := -lgdi32 -lshell32 + platform-lflags := -lgdi32 else crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp android-cflags += -fPIC -DHAVE_SYS_UIO_H @@ -775,10 +776,10 @@ ifeq ($(platform),windows) endif cxx = x86_64-w64-mingw32-g++ $(mflag) cc = x86_64-w64-mingw32-gcc $(mflag) - dlltool = dlltool - ar = ar - ranlib = ranlib - strip = strip + dlltool = x86_64-w64-mingw32-dlltool + ar = x86_64-w64-mingw32-ar + ranlib = x86_64-w64-mingw32-ranlib + strip = x86_64-w64-mingw32-strip inc = "$(win64)/include" lib = "$(win64)/lib" else diff --git a/src/classpath-android.cpp b/src/classpath-android.cpp index 854fd92ee8..c188439e5e 100644 --- a/src/classpath-android.cpp +++ b/src/classpath-android.cpp @@ -2336,9 +2336,6 @@ Avian_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8 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_net_RawSocket(_JNIEnv*) { } void register_org_apache_harmony_xnet_provider_jsse_NativeCrypto(_JNIEnv*) { } From 7cac232bd4d99d4bb4a76203b4c20f5a5649f525 Mon Sep 17 00:00:00 2001 From: Ilya Mizus Date: Thu, 6 Mar 2014 18:35:20 +0400 Subject: [PATCH 13/14] Tools fixed --- makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 35ebf7abf9..6491cc2b3b 100755 --- a/makefile +++ b/makefile @@ -776,10 +776,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 From 5403a43edf9cf177bd927da74a0ed75c4eb8f829 Mon Sep 17 00:00:00 2001 From: Vasily Litvinov Date: Wed, 12 Mar 2014 01:11:33 +0400 Subject: [PATCH 14/14] Enabling org_conscrypt_NativeCrypto.cpp build --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 1dca10bdcf..d5b94e9f98 100755 --- a/makefile +++ b/makefile @@ -191,7 +191,7 @@ ifneq ($(android),) crypto-native := $(android)/libcore/crypto/src/main/native ifeq ($(platform),windows) - crypto-cpps := + crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp android-cflags += -D__STDC_CONSTANT_MACROS blacklist = $(luni-native)/java_io_Console.cpp \ $(luni-native)/java_lang_ProcessManager.cpp \