diff options
Diffstat (limited to 'build-scripts/build-android')
| -rw-r--r-- | build-scripts/build-android | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index 8ec53fd..f40bcc1 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -63,8 +63,21 @@ else eval $CONFIGURATION set +a - export JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.22/ - export ANDROID_JAVA_HOME=$JAVA_HOME + # Select JAVA version based on Android version. Android 4.4 < builds with JAVA6 + # AOSP master and future build will use java 1.7 openjdk. + if [ -n "USE_JAVA_6" ]; then + sudo update-alternatives --set java /usr/lib/jvm/java-6-sun-1.6.0.22/jre/bin/java + sudo update-alternatives --set javac /usr/lib/jvm/java-6-sun-1.6.0.22/bin/javac + sudo update-alternatives --set javadoc /usr/lib/jvm/java-6-sun-1.6.0.22/bin/javadoc + export JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.22/ + export ANDROID_JAVA_HOME=$JAVA_HOME + else + sudo update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java + sudo update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac + sudo update-alternatives --set javadoc /usr/lib/jvm/java-7-openjdk-amd64/bin/javadoc + export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/ + export ANDROID_JAVA_HOME=$JAVA_HOME + fi MAKE_TARGETS="${MAKE_TARGETS-boottarball systemtarball userdatatarball}" calc_make_jobs |