diff options
| -rw-r--r-- | build-scripts/build-android | 12 |
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 |