diff --git a/makefile b/makefile index f0f618d9ff..9273561bc9 100755 --- a/makefile +++ b/makefile @@ -191,21 +191,20 @@ ifneq ($(android),) crypto-native := $(android)/libcore/crypto/src/main/native + crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp + ifeq ($(platform),windows) - 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 \ - $(luni-native)/libcore_net_RawSocket.cpp \ - $(luni-native)/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp \ - + $(luni-native)/libcore_net_RawSocket.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 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 \ diff --git a/src/classpath-android.cpp b/src/classpath-android.cpp index 9221ae2614..2badc33796 100644 --- a/src/classpath-android.cpp +++ b/src/classpath-android.cpp @@ -2337,7 +2337,7 @@ Avian_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8 void register_java_io_Console(_JNIEnv*) { } void register_java_lang_ProcessManager(_JNIEnv*) { } void register_libcore_net_RawSocket(_JNIEnv*) { } -void register_org_apache_harmony_xnet_provider_jsse_NativeCrypto(_JNIEnv*) { } +//void register_org_apache_harmony_xnet_provider_jsse_NativeCrypto(_JNIEnv*) { } extern "C" AVIAN_EXPORT void JNICALL Avian_libcore_io_OsConstants_initConstants