diff options
author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 17:44:37 +0300 |
---|---|---|
committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 17:44:37 +0300 |
commit | 053825519f1f73ed4ab5650495d649129f619828 (patch) | |
tree | a92ad0d33ce288199a112b08102c2fae7178bb79 | |
parent | ac460a124e128b64600fde4ac13f2f07cb50c9a7 (diff) |
Fix var references.
Change-Id: I60caf850a4c2e486c2e34925babea67be0f30bc0
-rw-r--r-- | build-scripts/build-android | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index b023743..15e8245 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -41,9 +41,9 @@ else # Select JAVA version based on Android version. Android 4.4 < builds with JAVA6 # AOSP master and future build will use java 1.7 openjdk. # Step 1/2 (fail fast) - if [ -n "USE_JAVA_6" ]; then + if [ -n "$USE_JAVA_6" ]; then sudo update-java-alternatives --set java-6-sun || true - elif [ -n "USE_JAVA_7" ]; then + elif [ -n "$USE_JAVA_7" ]; then sudo update-java-alternatives --set java-1.7.0-openjdk-amd64 || true fi @@ -78,10 +78,10 @@ else # Select JAVA version based on Android version. Android 4.4 < builds with JAVA6 # AOSP master and future build will use java 1.7 openjdk. # Step 2/2 -# if [ -n "USE_JAVA_6" ]; then +# if [ -n "$USE_JAVA_6" ]; then # export JAVA_HOME=/usr/lib/jvm/java-6-sun/ # export ANDROID_JAVA_HOME=$JAVA_HOME -# elif [ -n "USE_JAVA_7" ]; then +# elif [ -n "$USE_JAVA_7" ]; then # export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/ # export ANDROID_JAVA_HOME=$JAVA_HOME # fi |