ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'avian-droid' of https://github.com/bigfatbrowncat/avian into avian-droid

Browse Source
This commit is contained in:
Vasily Litvinov 2014-03-12 01:11:41 +04:00
commit e3ddb14fd2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makefile
View File

@ -180,7 +180,8 @@ ifneq ($(android),)
-DJNI_JARJAR_PREFIX= \ -DJNI_JARJAR_PREFIX= \
-D__DARWIN_UNIX03=1 \ -D__DARWIN_UNIX03=1 \
-D__PROVIDE_FIXMES \ -D__PROVIDE_FIXMES \
-g3 -g3 \
-Werror
luni-cpps := $(shell find $(luni-native) -name '*.cpp') luni-cpps := $(shell find $(luni-native) -name '*.cpp')
@ -202,7 +203,7 @@ ifneq ($(android),)
icu-libs := $(android)/external/icu4c/lib/sicuin.a \ icu-libs := $(android)/external/icu4c/lib/sicuin.a \
$(android)/external/icu4c/lib/sicuuc.a \ $(android)/external/icu4c/lib/sicuuc.a \
$(android)/external/icu4c/lib/sicudt.a $(android)/external/icu4c/lib/sicudt.a
platform-lflags := -lgdi32 -lshell32 platform-lflags := -lgdi32
else else
crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
android-cflags += -fPIC -DHAVE_SYS_UIO_H android-cflags += -fPIC -DHAVE_SYS_UIO_H

3
src/classpath-android.cpp
View File

@ -2336,9 +2336,6 @@ 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_io_OsConstants(_JNIEnv*) { }
//void register_libcore_io_AsynchronousCloseMonitor(_JNIEnv*) { }
//void register_libcore_io_Posix(_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*) { }