aboutsummaryrefslogtreecommitdiff
path: root/node/setup-build-android
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2014-05-17 12:51:13 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2014-05-23 14:37:10 +0530
commitbf68fbf7aa0603f0a4c3e472e1c681e0edc214e8 (patch)
tree7aa812aff39bd1fb97eef9198532158cddd1217f /node/setup-build-android
parent68f3c0400f0793585426a4f4aecb3f652e5c1c60 (diff)
Choose the right version of JAVA based on USE_JAVA_6HEADmaster
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>
Diffstat (limited to 'node/setup-build-android')
-rwxr-xr-xnode/setup-build-android1
1 files changed, 1 insertions, 0 deletions
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