diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 17:33:16 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 17:33:16 +0300 |
| commit | f4905408ba7d92a6c3f8880a4473281ee0fa0c47 (patch) | |
| tree | 3a19af508f7f2c480b0112a80c39c4ce5cdc3e75 | |
| parent | 2c71d10cfb9d5c2c2daeea420d724b7fc943b319 (diff) | |
Workaround empty if/then.
Change-Id: I80b9e8e354caebfb8b6f24bc0e082051622ba563
| -rw-r--r-- | build-scripts/build-android | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index 5b8e794..c4f82a1 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -78,13 +78,13 @@ 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 +# fi MAKE_TARGETS="${MAKE_TARGETS-boottarball systemtarball userdatatarball}" calc_make_jobs |