mirror of
https://github.com/corda/corda.git
synced 2025-05-31 06:31:08 +00:00
Adding a define to tell Android Classpath to disable IPv6, removing -fPIC on Windows as it's useless there and generates warnings
This commit is contained in:
parent
e217a4faf8
commit
63a691f41d
4
makefile
4
makefile
@ -179,6 +179,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 \
|
||||||
|
-D__DISABLE_IPV6_PROTO \
|
||||||
-g3
|
-g3
|
||||||
|
|
||||||
luni-cpps := $(shell find $(luni-native) -name '*.cpp')
|
luni-cpps := $(shell find $(luni-native) -name '*.cpp')
|
||||||
@ -193,9 +194,6 @@ ifneq ($(android),)
|
|||||||
|
|
||||||
ifeq ($(platform),windows)
|
ifeq ($(platform),windows)
|
||||||
android-cflags += -D__STDC_CONSTANT_MACROS
|
android-cflags += -D__STDC_CONSTANT_MACROS
|
||||||
ifneq ($(arch),i386)
|
|
||||||
android-cflags += -fPIC
|
|
||||||
endif
|
|
||||||
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 \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user