ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-05 20:54:13 +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-05 03:03:07 +04:00
commit 24ba96192c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -189,10 +189,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 \
@ -205,6 +204,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 \