aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse/scripts/create_all_symlinks.sh
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2013-03-12 13:20:59 -0700
committerRaphael Moll <ralf@android.com>2013-03-13 20:34:06 -0700
commitbc982e5d2a6ffc0fa5c76eaf39e77e4ec415e637 (patch)
tree1fb8ca02b4ea76c5cdf337d817309479333ffbf5 /eclipse/scripts/create_all_symlinks.sh
parent7a9f8b7aafb7b38e07eb55bfdcc001fc13d84e91 (diff)
downloadsdk-bc982e5d2a6ffc0fa5c76eaf39e77e4ec415e637.zip
sdk-bc982e5d2a6ffc0fa5c76eaf39e77e4ec415e637.tar.gz
sdk-bc982e5d2a6ffc0fa5c76eaf39e77e4ec415e637.tar.bz2
Build SDK using prebuilts/devtools.
Change-Id: I4c1979f8f07d24573b3ff7d7a1fa22d6ea87e5e3
Diffstat (limited to 'eclipse/scripts/create_all_symlinks.sh')
-rwxr-xr-xeclipse/scripts/create_all_symlinks.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh
index ec738dc..281159d 100755
--- a/eclipse/scripts/create_all_symlinks.sh
+++ b/eclipse/scripts/create_all_symlinks.sh
@@ -176,7 +176,7 @@ fi
### HIERARCHYVIEWER ###
HV_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/libs"
-HV_LIBS="hierarchyviewerlib swtmenubar"
+HV_LIBS="hierarchyviewer2lib swtmenubar"
LIBS="$LIBS $HV_LIBS"
CP_FILES="$CP_FILES @:$HV_DEST $HV_LIBS"
@@ -226,6 +226,9 @@ fi
LIBS2=""
for LIB in $LIBS; do
J="prebuilts/devtools/tools/lib/$LIB.jar"
+ if [[ ! -f $J ]]; then
+ J="prebuilts/devtools/adt/lib/$LIB.jar"
+ fi
if [[ -f $J ]]; then
warn "## Using existing $J"
else
@@ -273,6 +276,9 @@ for SRC in $CP_FILES; do
# Take a prebuilts/devtools instead of a framework one if possible.
SRC="prebuilts/devtools/tools/lib/$SRC.jar"
if [[ ! -f "$SRC" ]]; then
+ SRC="prebuilts/devtools/adt/lib/$ORIG_SRC.jar"
+ fi
+ if [[ ! -f "$SRC" ]]; then
SRC="out/host/$PLATFORM/framework/$ORIG_SRC.jar"
fi
fi