aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-05-23 17:35:34 +0300
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-05-23 17:35:34 +0300
commitac460a124e128b64600fde4ac13f2f07cb50c9a7 (patch)
tree93bbf1c2d72362640fe46550d6875cd034c86752
parentf4905408ba7d92a6c3f8880a4473281ee0fa0c47 (diff)
There're always some errors with update-java-alternatives, so ignore its rc.
"update-alternatives: error: no alternatives for mozilla-javaplugin.so.", etc. Change-Id: I1c2b038f6f749d22804a1e952303eb400f61398c
-rw-r--r--build-scripts/build-android4
1 files changed, 2 insertions, 2 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android
index c4f82a1..b023743 100644
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -42,9 +42,9 @@ else
# 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
+ sudo update-java-alternatives --set java-6-sun || true
elif [ -n "USE_JAVA_7" ]; then
- sudo update-java-alternatives --set java-1.7.0-openjdk-amd64
+ sudo update-java-alternatives --set java-1.7.0-openjdk-amd64 || true
fi
if [ -n "$REPO_SEED_URL" ]; then