Added $ANDROID_SDK_ROOT variable

meefik · Mar 17, 2016 · 3da121b · 3da121b
1 parent d7d20d6
commit 3da121b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/contrib/ZoneCompactor/build-dex.sh b/contrib/ZoneCompactor/build-dex.sh
@@ -6,7 +6,8 @@
 if [ "$1" == "clean" ]; then
 find . -name "*.class" -exec rm {} \;
 else
-DX="$HOME/android-sdk-linux/build-tools/*/dx"
+[ -z "$ANDROID_SDK_ROOT" ] && ANDROID_SDK_ROOT="$HOME/Android/Sdk"
+DX="$ANDROID_SDK_ROOT/build-tools/*/dx"
 javac -source 1.5 -target 1.5 -d . ZoneCompactor.java libcore/util/ZoneInfo.java libcore/io/BufferIterator.java
 ${DX} --dex --output=ZoneCompactor.dex $(find . -name '*.class' -type f)
 fi
diff --git a/contrib/ZoneCompactorLegacy/build-dex.sh b/contrib/ZoneCompactorLegacy/build-dex.sh
@@ -5,7 +5,8 @@
 if [ "$1" == "clean" ]; then
 find . -name "*.class" -exec rm {} \;
 else
-DX="$HOME/android-sdk-linux/build-tools/*/dx"
+[ -z "$ANDROID_SDK_ROOT" ] && ANDROID_SDK_ROOT="$HOME/Android/Sdk"
+DX="$ANDROID_SDK_ROOT/build-tools/*/dx"
 javac -source 1.3 -target 1.3 -d . ZoneCompactor.java ZoneInfo.java
 ${DX} --dex --output=ZoneCompactorLegacy.dex $(find . -name '*.class' -type f)
 fi