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

Fixed jar tool usage - we should call "$(jar)" instead of simply "jar"

Browse Source
This commit is contained in:
Vasily Litvinov 2014-09-01 01:13:14 +04:00
parent f2493650d5
commit 33680dd676
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
makefile
View File

@ -1668,21 +1668,21 @@ $(build)/android.dep: $(luni-javas) $(dalvik-javas) $(libart-javas) \
cp -a $(luni-java)/* $(xml-java)/* $(build)/android-src/
rm $(call noop-files,$(luni-blacklist),$(luni-java),$(build)/android-src)
(cd $(dalvik-java) && \
jar c $(call noop-files,$(dalvik-javas),$(dalvik-java),.)) \
| (cd $(build)/android-src && jar x)
$(jar) c $(call noop-files,$(dalvik-javas),$(dalvik-java),.)) \
| (cd $(build)/android-src && $(jar) x)
(cd $(libart-java) && \
jar c $(call noop-files,$(libart-javas),$(libart-java),.)) \
| (cd $(build)/android-src && jar x)
$(jar) c $(call noop-files,$(libart-javas),$(libart-java),.)) \
| (cd $(build)/android-src && $(jar) x)
(cd $(crypto-java) && \
jar c $(call noop-files,$(crypto-javas),$(crypto-java),.)) \
| (cd $(build)/android-src && jar x)
$(jar) c $(call noop-files,$(crypto-javas),$(crypto-java),.)) \
| (cd $(build)/android-src && $(jar) x)
(cd $(crypto-platform-java) && \
jar c $(call noop-files,$(crypto-platform-javas),$(crypto-platform-java),.)) \
| (cd $(build)/android-src && jar x)
$(jar) c $(call noop-files,$(crypto-platform-javas),$(crypto-platform-java),.)) \
| (cd $(build)/android-src && $(jar) x)
(cd $(classpath-src) && \
jar c $(call noop-files,$(classpath-sources),$(classpath-src),.)) \
| (cd $(build)/android-src && jar x)
# (cd android && jar c *) | (cd $(build)/android-src && jar x)
$(jar) c $(call noop-files,$(classpath-sources),$(classpath-src),.)) \
| (cd $(build)/android-src && $(jar) x)
# (cd android && $(jar) c *) | (cd $(build)/android-src && $(jar) x)
find $(build)/android-src -name '*.java' > $(build)/android.txt
$(javac) -Xmaxerrs 1000 -d $(build)/android @$(build)/android.txt
rm $(build)/android/sun/misc/Unsafe* \