diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 14:51:29 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 14:51:29 +0300 |
| commit | bd9d8196a316b07953a1acfaff3caa4894f466c6 (patch) | |
| tree | 6b6f6deaeb09d23e6d515faeecc46af3205002dc | |
| parent | d2dc387b52beb40d2a079eda6ee051b34cae287b (diff) | |
Allow to select java version fot build using USE_JAVA_6 or USE_JAVA_7 vars.
Change-Id: I5ea2bf75bd0900fae5f1df0e5611ec0be1277c3f
| -rw-r--r-- | build-scripts/build-android | 18 | ||||
| -rwxr-xr-x | node/setup-build-android | 2 |
2 files changed, 17 insertions, 3 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index 8ec53fd..b474dab 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2011 Linaro +# Copyright (c) 2014 Linaro # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -63,8 +63,20 @@ else eval $CONFIGURATION set +a - export JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.22/ - export ANDROID_JAVA_HOME=$JAVA_HOME +# 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-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 MAKE_TARGETS="${MAKE_TARGETS-boottarball systemtarball userdatatarball}" calc_make_jobs diff --git a/node/setup-build-android b/node/setup-build-android index 91ccc06..137a523 100755 --- a/node/setup-build-android +++ b/node/setup-build-android @@ -139,3 +139,5 @@ sudo apt-get install -y acpica-tools # Allow 'jenkins-build' user to run linaro-android-media-create via sudo echo "jenkins-build ALL = NOPASSWD: /usr/bin/linaro-android-media-create" >>/etc/sudoers +# Allow 'jenkins-build' user to set java version used to build Android +echo "jenkins-build ALL = NOPASSWD: /usr/bin/update-java-alternatives" >>/etc/sudoers |