summaryrefslogtreecommitdiffstats
path: root/core/find-jdk-tools-jar.sh
Commit message (Collapse)AuthorAgeFilesLines
* Fix Java detection on some Linux distributionsBernhard Rosenkraenzer2014-10-161-1/+7
| | | | | | | | | | | | | | | | On some Linux distributions (spotted here on OpenMandriva Lx, but I'm pretty sure some others do the same thing), "which javac" returns /usr/bin/javac, which is a symlink to "../../etc/alternatives/javac", which in turn points at whatever the JDK the user picked as his default. Given "../../etc/alternatives/javac" is a relative symlink, the next iteration of LSLINE=$(ls -l "$JAVAC") fails (no ../../etc/alternatives/java relative to the build directory), causing tools.jar not to be found. Using realpath and readlink where possible should work in all cases. Change-Id: Ic60ac84a5b263dc1c1f2960092a7549d1024ed2e Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* Revert "Fix Java detection on some Linux distributions"Ying Wang2014-07-151-1/+5
| | | | | | This reverts commit 09040dd8232f8fe588d938e04581ba1648f452f4. Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
* Fix Java detection on some Linux distributionsBernhard Rosenkränzer2014-07-141-5/+1
| | | | | | | | | | | | | | | | | | On some Linux distributions (spotted here on OpenMandriva Lx, but I'm pretty sure some others do the same thing), "which javac" returns /usr/bin/javac, which is a symlink to "../../etc/alternatives/javac", which in turn points at whatever the JDK the user picked as his default. Given "../../etc/alternatives/javac" is a relative, symlink, the next iteration of LSLINE=$(ls -l "$JAVAC") fails (no ../../etc/alternatives/java relative to the build directory), causing tools.jar not to be found. Using readlink -f should work in all cases (while also simplifying the script a bit). Change-Id: I96afcf8e6460861bf8bb849dae05c27c42b91e84 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* Merge from AOSPThe Android Open Source Project2011-11-111-0/+1
|\ | | | | | | Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647
| * Add a hash-bang as the first line of a shell scriptJean-Baptiste Queru2011-11-111-0/+1
| | | | | | | | Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf
* | am 8755e2b2: am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."Raphael Moll2011-03-111-3/+3
|\| | | | | | | | | * commit '8755e2b2c21dd54063fcb62c26c4a2d3575610cf': Fix find-jdk-tools-jar to be cygwin-friendly.
| * Fix find-jdk-tools-jar to be cygwin-friendly.Raphael Moll2011-03-081-3/+3
| | | | | | | | Change-Id: I9cf2035026725fd1ba8a014b484262ed1acc1df4
| * Enforce 64-bit build environmentYing Wang2010-09-221-1/+1
| | | | | | | | | | | | We will only support 64-bit build environment beyond froyo/2.2 . Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
* | resolved conflicts for merge of 554402f7 to masterYing Wang2010-09-221-1/+1
|\ \ | | | | | | | | | Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
| * | String literal change.Ying Wang2010-09-221-1/+1
| |/ | | | | | | Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
* / Make build/core/find-jdk-tools-jar.sh fail more explicitlyYing Wang2010-07-201-1/+0
|/ | | | | | | | | | http://b/issue?id=1505957 Before this change, if tools.jar can not be found, make reports error like: make: *** No rule to make target `Please-install-JDK-5.0,-update-12-or-higher,-which-you-can-download-from-java.sun.com'... With this change, the error message is much nicer: build/core/config.mk:264: *** Error: could not find jdk tools.jar, please install JDK-5.0, update 12 or higher, which you can download from java.sun.com. Stop. Change-Id: Id33cfb6ee7676d66f00d0a41d07c1f27abc6a402
* Remove bashism from find-jdk-tools-jar.shAngus Lees2009-01-301-1/+1
|
* Detect a missing javac and provide a slightly more helpful error message.Rod Whitby2008-10-221-0/+4
| | | | | | | Note the hyphens in the error message are required because the output of this scripts is used directly in a Makefile target. Signed-off-by: Rod Whitby <rod@whitby.id.au>
* Initial ContributionThe Android Open Source Project2008-10-211-0/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 23:23:17 +0000