aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-05-23 17:30:35 +0300
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-05-23 17:30:35 +0300
commit2c71d10cfb9d5c2c2daeea420d724b7fc943b319 (patch)
treea1d1d1b029757d8773e2b018b267eb334211ccf5
parentd7ea532ba5335b8d2340d47f9977a8dceb9527e5 (diff)
Set java version in fail-fast manner.
Change-Id: I25f2e465b0996817fb20b3ff25079f3709e6035c
-rw-r--r--build-scripts/build-android12
1 files changed, 10 insertions, 2 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android
index b474dab..5b8e794 100644
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -38,6 +38,15 @@ else
download_overlays "$SOURCE_OVERLAY"
fi
+ # Select JAVA version based on Android version. Android 4.4 < builds with JAVA6
+ # AOSP master and future build will use java 1.7 openjdk.
+ # Step 1/2 (fail fast)
+ if [ -n "USE_JAVA_6" ]; then
+ sudo update-java-alternatives --set java-6-sun
+ elif [ -n "USE_JAVA_7" ]; then
+ sudo update-java-alternatives --set java-1.7.0-openjdk-amd64
+ fi
+
if [ -n "$REPO_SEED_URL" ]; then
repo-sync-from-seed "${1}"
else
@@ -68,12 +77,11 @@ else
# Select JAVA version based on Android version. Android 4.4 < builds with JAVA6
# AOSP master and future build will use java 1.7 openjdk.
+ # Step 2/2
if [ -n "USE_JAVA_6" ]; then
- sudo update-java-alternatives --set java-6-sun
# export JAVA_HOME=/usr/lib/jvm/java-6-sun/
# export ANDROID_JAVA_HOME=$JAVA_HOME
elif [ -n "USE_JAVA_7" ]; then
- sudo update-java-alternatives --set java-1.7.0-openjdk-amd64
# export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/
# export ANDROID_JAVA_HOME=$JAVA_HOME
fi