mirror of
https://github.com/corda/corda.git
synced 2025-01-19 03:06:36 +00:00
Slight reformatting
This commit is contained in:
parent
84a102247d
commit
e55007297b
6
makefile
6
makefile
@ -1586,14 +1586,16 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \
|
||||
cp $(android)/external/expat/lib/expat*.h $(build)/android-src/libexpat/
|
||||
cp -a $(luni-java)/* $(libdvm-java)/* $(crypto-java)/* $(dalvik-java)/* \
|
||||
$(xml-java)/* $(build)/android-src/
|
||||
ifeq ($(platform),windows)
|
||||
|
||||
ifeq ($(platform),windows)
|
||||
# convert line endings... otherwise patches are difficult
|
||||
# do that by first "dry-running" the patch to determine which files are patched
|
||||
patch -d $(build)/android-src -p1 --dry-run -f < android-patches.diff | \
|
||||
grep -E '^patching file ' | sed -e 's/^patching file \(.*\)/\1/g' | \
|
||||
( cd $(build)/android-src && xargs dos2unix )
|
||||
# now patch the files
|
||||
endif
|
||||
|
||||
# now patch the files
|
||||
( cd $(build)/android-src && patch -p1 ) < android-patches.diff
|
||||
find $(build)/android-src -name '*.java' > $(build)/android.txt
|
||||
$(javac) -Xmaxerrs 1000 -d $(build)/android -sourcepath $(luni-java) \
|
||||
|
Loading…
Reference in New Issue
Block a user