ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-22 02:07:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Changes to build on my libcore version

Browse Source
This commit is contained in:
Ilya Mizus 2014-02-21 03:50:06 +03:00
parent 15d9128d2d
commit ff4c07f05b
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
makefile
View File

@ -173,8 +173,7 @@ ifneq ($(android),)
-DOS_SHARED_LIB_FORMAT_STR="\"$(so-prefix)%s$(so-suffix)\"" \ -DOS_SHARED_LIB_FORMAT_STR="\"$(so-prefix)%s$(so-suffix)\"" \
-DJNI_JARJAR_PREFIX= \ -DJNI_JARJAR_PREFIX= \
-D__DARWIN_UNIX03=1 \ -D__DARWIN_UNIX03=1 \
-g3 \ -g3
-Werror
luni-cpps := $(shell find $(luni-native) -name '*.cpp') luni-cpps := $(shell find $(luni-native) -name '*.cpp')
@ -183,7 +182,8 @@ ifneq ($(android),)
$(libnativehelper-native)/toStringArray.cpp $(libnativehelper-native)/toStringArray.cpp
crypto-native := $(android)/libcore/crypto/src/main/native 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) ifeq ($(platform),windows)
android-cflags += -D__STDC_CONSTANT_MACROS android-cflags += -D__STDC_CONSTANT_MACROS
@ -193,17 +193,14 @@ ifneq ($(android),)
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_io_OsConstants.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)/libcore_net_RawSocket.cpp \
$(luni-native)/org_apache_harmony_xnet_provider_jsse_NativeCrypto.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)) luni-cpps := $(filter-out $(blacklist),$(luni-cpps))
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 platform-lflags := -lgdi32 -lshell32
else else
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 \
@ -775,10 +772,10 @@ ifeq ($(platform),windows)
endif endif
cxx = x86_64-w64-mingw32-g++ $(mflag) cxx = x86_64-w64-mingw32-g++ $(mflag)
cc = x86_64-w64-mingw32-gcc $(mflag) cc = x86_64-w64-mingw32-gcc $(mflag)
dlltool = x86_64-w64-mingw32-dlltool dlltool = dlltool
ar = x86_64-w64-mingw32-ar ar = ar
ranlib = x86_64-w64-mingw32-ranlib ranlib = ranlib
strip = x86_64-w64-mingw32-strip strip = strip
inc = "$(win64)/include" inc = "$(win64)/include"
lib = "$(win64)/lib" lib = "$(win64)/lib"
else else

4
src/classpath-android.cpp
View File

@ -2307,8 +2307,8 @@ Avian_java_lang_System_mapLibraryName
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_OsConstants(_JNIEnv*) { }
void register_libcore_io_AsynchronousCloseMonitor(_JNIEnv*) { } //void register_libcore_io_AsynchronousCloseMonitor(_JNIEnv*) { }
void register_libcore_io_Posix(_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*) { }