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

Made it so all non-.java files from luni/src/main will be added to classpath directory

Browse Source
This commit is contained in:
Vasily Litvinov 2014-03-18 19:22:52 +04:00
parent 3bd903ca69
commit df06564392
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makefile
View File

@ -230,9 +230,8 @@ ifneq ($(android),)
$(call cpp-objects,$(libnativehelper-cpps),$(libnativehelper-native),$(build)) $(call cpp-objects,$(libnativehelper-cpps),$(libnativehelper-native),$(build))
luni-java = $(android)/libcore/luni/src/main/java luni-java = $(android)/libcore/luni/src/main/java
luni-javas := $(shell find $(luni-java) -name '*.java') luni-javas := $(shell find $(luni-java) -name '*.java')
java-prop = $(android)/libcore/luni/src/main/java luni-nonjavas := $(shell find $(luni-java) -not -type d -not -name '*.java')
java-props := $(shell find $(java-prop) -name '*.properties') luni-copied-nonjavas = $(call noop-files,$(luni-nonjavas),$(luni-java),)
java-copied-props = $(call java-properties,$(java-props),$(java-prop),)
libdvm-java = $(android)/libcore/libdvm/src/main/java libdvm-java = $(android)/libcore/libdvm/src/main/java
libdvm-javas := $(shell find $(libdvm-java) -name '*.java') libdvm-javas := $(shell find $(libdvm-java) -name '*.java')
crypto-java = $(android)/libcore/crypto/src/main/java crypto-java = $(android)/libcore/crypto/src/main/java
@ -1097,7 +1096,7 @@ c-objects = $(foreach x,$(1),$(patsubst $(2)/%.c,$(3)/%.o,$(x)))
cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%.o,$(x))) cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%.o,$(x)))
asm-objects = $(foreach x,$(1),$(patsubst $(2)/%.$(asm-format),$(3)/%-asm.o,$(x))) asm-objects = $(foreach x,$(1),$(patsubst $(2)/%.$(asm-format),$(3)/%-asm.o,$(x)))
java-classes = $(foreach x,$(1),$(patsubst $(2)/%.java,$(3)/%.class,$(x))) java-classes = $(foreach x,$(1),$(patsubst $(2)/%.java,$(3)/%.class,$(x)))
java-properties = $(foreach x,$(1),$(patsubst $(2)/%.properties,$(3)/%.properties,$(x))) noop-files = $(foreach x,$(1),$(patsubst $(2)/%,$(3)/%,$(x)))
generated-code = \ generated-code = \
$(build)/type-enums.cpp \ $(build)/type-enums.cpp \
@ -1585,7 +1584,7 @@ $(build)/%.o: $(build)/android-src/%.cpp $(build)/android.dep
$$($(windows-path) $(<)) $(call output,$(@)) $$($(windows-path) $(<)) $(call output,$(@))
$(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \
$(dalvik-javas) $(xml-javas) $(java-props) $(dalvik-javas) $(xml-javas) $(luni-nonjavas)
@echo "compiling luni classes" @echo "compiling luni classes"
@mkdir -p $(classpath-build) @mkdir -p $(classpath-build)
@mkdir -p $(build)/android @mkdir -p $(build)/android
@ -1605,8 +1604,8 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \
rm $(build)/android/sun/misc/Unsafe* \ rm $(build)/android/sun/misc/Unsafe* \
$(build)/android/java/lang/reflect/Proxy* $(build)/android/java/lang/reflect/Proxy*
cp -r $(build)/android/* $(classpath-build) cp -r $(build)/android/* $(classpath-build)
for x in $(java-copied-props); \ for x in $(luni-copied-nonjavas); \
do cp -f $(java-prop)$${x} $(classpath-build)$${x} ; \ do cp -f $(luni-java)$${x} $(classpath-build)$${x} ; \
done done
@touch $(@) @touch $(@)