aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-11-14 19:29:14 +0200
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-11-14 19:29:14 +0200
commit7eda27d765eb1ade749bb10a2b2081b58303fdfe (patch)
treefdbdbbc6e93f6a2b70f2ae37fdb1398baf7041bd
parent760b6076bc4b55f13e014df8460e2d8d17f5e060 (diff)
downloadlinaro-android-build-tools-7eda27d765eb1ade749bb10a2b2081b58303fdfe.tar.gz
After switch to Oracle JDK, set java-6-oracle as default (instead of *-sun).
Change-Id: Idbccf0e949958d530d91c8cb938f2e6e2e4fd0cb
-rwxr-xr-xnode/setup-build-android2
1 files changed, 1 insertions, 1 deletions
diff --git a/node/setup-build-android b/node/setup-build-android
index daa9ac7..e475204 100755
--- a/node/setup-build-android
+++ b/node/setup-build-android
@@ -123,7 +123,7 @@ apt-get-retry install -y \
# x11proto-core-dev \
# set java-6-sun as default
-update-java-alternatives -s java-6-sun || true
+update-java-alternatives -s java-6-oracle || true
## set java-7-openjdk as default ("java-7-openjdk-amd64" doesn't work here)
#update-java-alternatives -s java-1.7.0-openjdk-amd64 || true