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

Slight reformatting

Browse Source
This commit is contained in:
Vasily Litvinov 2014-04-05 01:17:21 +04:00
parent 84a102247d
commit e55007297b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -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 $(android)/external/expat/lib/expat*.h $(build)/android-src/libexpat/
cp -a $(luni-java)/* $(libdvm-java)/* $(crypto-java)/* $(dalvik-java)/* \ cp -a $(luni-java)/* $(libdvm-java)/* $(crypto-java)/* $(dalvik-java)/* \
$(xml-java)/* $(build)/android-src/ $(xml-java)/* $(build)/android-src/
ifeq ($(platform),windows)
ifeq ($(platform),windows)
# convert line endings... otherwise patches are difficult # convert line endings... otherwise patches are difficult
# do that by first "dry-running" the patch to determine which files are patched # 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 | \ patch -d $(build)/android-src -p1 --dry-run -f < android-patches.diff | \
grep -E '^patching file ' | sed -e 's/^patching file \(.*\)/\1/g' | \ grep -E '^patching file ' | sed -e 's/^patching file \(.*\)/\1/g' | \
( cd $(build)/android-src && xargs dos2unix ) ( cd $(build)/android-src && xargs dos2unix )
# now patch the files
endif endif
# now patch the files
( cd $(build)/android-src && patch -p1 ) < android-patches.diff ( cd $(build)/android-src && patch -p1 ) < android-patches.diff
find $(build)/android-src -name '*.java' > $(build)/android.txt find $(build)/android-src -name '*.java' > $(build)/android.txt
$(javac) -Xmaxerrs 1000 -d $(build)/android -sourcepath $(luni-java) \ $(javac) -Xmaxerrs 1000 -d $(build)/android -sourcepath $(luni-java) \