ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

NativeCrypto added for Windows

Browse Source
This commit is contained in:
Ilya Mizus 2014-03-15 21:21:24 +03:00
parent f52ebdc323
commit abc9316702
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makefile
View File

@ -191,13 +191,13 @@ ifneq ($(android),)
crypto-native := $(android)/libcore/crypto/src/main/native crypto-native := $(android)/libcore/crypto/src/main/native
ifeq ($(platform),windows)
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 android-cflags += -D__STDC_CONSTANT_MACROS
blacklist = $(luni-native)/java_io_Console.cpp \ blacklist = $(luni-native)/java_io_Console.cpp \
$(luni-native)/java_lang_ProcessManager.cpp \ $(luni-native)/java_lang_ProcessManager.cpp \
$(luni-native)/libcore_net_RawSocket.cpp \ $(luni-native)/libcore_net_RawSocket.cpp
$(luni-native)/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp \
luni-cpps := $(filter-out $(blacklist),$(luni-cpps)) luni-cpps := $(filter-out $(blacklist),$(luni-cpps))
icu-libs := $(android)/external/icu4c/lib/sicuin.a \ icu-libs := $(android)/external/icu4c/lib/sicuin.a \
@ -205,7 +205,6 @@ ifneq ($(android),)
$(android)/external/icu4c/lib/sicudt.a $(android)/external/icu4c/lib/sicudt.a
platform-lflags := -lgdi32 platform-lflags := -lgdi32
else else
crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
android-cflags += -fPIC -DHAVE_SYS_UIO_H android-cflags += -fPIC -DHAVE_SYS_UIO_H
icu-libs := $(android)/external/icu4c/lib/libicui18n.a \ icu-libs := $(android)/external/icu4c/lib/libicui18n.a \
$(android)/external/icu4c/lib/libicuuc.a \ $(android)/external/icu4c/lib/libicuuc.a \

2
src/classpath-android.cpp
View File

@ -2337,7 +2337,7 @@ Avian_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8
void register_java_io_Console(_JNIEnv*) { } void register_java_io_Console(_JNIEnv*) { }
void register_java_lang_ProcessManager(_JNIEnv*) { } void register_java_lang_ProcessManager(_JNIEnv*) { }
void register_libcore_net_RawSocket(_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 extern "C" AVIAN_EXPORT void JNICALL
Avian_libcore_io_OsConstants_initConstants Avian_libcore_io_OsConstants_initConstants