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

Removing workaround for Enum.java, fixing the root cause of the issue

Browse Source
This commit is contained in:
Vasily Litvinov 2014-02-26 03:35:05 +04:00
parent a2ff617f1e
commit e217a4faf8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -1593,14 +1593,12 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \
@mkdir -p $(build)/android-src/libexpat @mkdir -p $(build)/android-src/libexpat
cp $(android)/external/fdlibm/fdlibm.h $(build)/android-src/external/fdlibm/ cp $(android)/external/fdlibm/fdlibm.h $(build)/android-src/external/fdlibm/
cp $(android)/external/expat/lib/expat*.h $(build)/android-src/libexpat/ cp $(android)/external/expat/lib/expat*.h $(build)/android-src/libexpat/
if [ -a $(build)/android-src/java/lang/Enum.java ] ; \
then \
chmod +w $(build)/android-src/java/lang/Enum.java ; \
fi;
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/
sed -i -e 's/return ordinal - o.ordinal;/return ordinal - o.ordinal();/' \ sed -i -e 's/return ordinal - o.ordinal;/return ordinal - o.ordinal();/' \
$(build)/android-src/java/lang/Enum.java $(build)/android-src/java/lang/Enum.java
# sed makes this file read-only which in turn breaks re-builds; so marking it as writable
chmod +w $(build)/android-src/java/lang/Enum.java
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) \
@$(build)/android.txt @$(build)/android.txt