diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-05-17 12:51:13 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-05-23 14:37:10 +0530 |
| commit | bf68fbf7aa0603f0a4c3e472e1c681e0edc214e8 (patch) | |
| tree | 7aa812aff39bd1fb97eef9198532158cddd1217f | |
| parent | 68f3c0400f0793585426a4f4aecb3f652e5c1c60 (diff) | |
config parameter. This will be phased out in future
after new Android release that will build using JAVA 7
Change-Id: I61cc776f53af70d6edaec0ff6ce79d4bbba7dcfb
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | build-scripts/build-android | 17 | ||||
| -rwxr-xr-x | node/setup-build-android | 1 |
2 files changed, 16 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 diff --git a/node/setup-build-android b/node/setup-build-android index 98e7356..a633912 100755 --- a/node/setup-build-android +++ b/node/setup-build-android @@ -135,3 +135,4 @@ 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 +echo "jenkins-build ALL = NOPASSWD: /usr/bin/update-alternatives" >>/etc/sudoers |