1 files changed, 40 insertions, 16 deletions
diff --git a/eclipse/scripts/create_test_symlinks.sh b/eclipse/scripts/create_test_symlinks.sh
index 110539a..1479e04 100755
--- a/eclipse/scripts/create_test_symlinks.sh
+++ b/eclipse/scripts/create_test_symlinks.sh
@@ -1,24 +1,48 @@
 #!/bin/bash
-cd ../plugins/com.android.ide.eclipse.tests
+
+set -e
+
+# CD to the top android directory
+D=`dirname "$0"`
+cd "$D/../../../../"
+
+# computes relative ".." paths from $1 to here (in /android)
+function back() {
+  echo $1 | sed 's@[^/]*@..@g'
+}
+
+BASE="development/tools/eclipse/plugins/com.android.ide.eclipse.tests"
+DEST=$BASE
+BACK=`back $DEST`
+
+
 HOST=`uname`
 if [ "$HOST" == "Linux" ]; then
-  ln -svf ../../../../out/host/linux-x86/framework/kxml2-2.3.0.jar .
+    DIR="ln -svf"
+    ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar "$DEST/"
+
 elif [ "$HOST" == "Darwin" ]; then
-  ln -svf ../../../../out/host/darwin-x86/framework/kxml2-2.3.0.jar .
+    DIR="ln -svf"
+    ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar "$DEST/"
+
 elif [ "${HOST:0:6}" == "CYGWIN" ]; then
-  if [ "x$1" == "x" ]; then
-    echo "Usage: $0 <path to jars>"
-    echo "Argument 1 should be the path to the jars you want to copy. "
-    echo "  e.g. android_sdk_windows_NNN/tools/lib/ "
-    echo "(since you can't rebuild them under Windows, you need prebuilt ones "
-    echo " from an SDK drop or a Linux/Mac)"
-    exit 1
-  fi
-  if [ ! -f "kxml2-2.3.0.jar" ]; then
-    wget -O "kxml2-2.3.0.jar" "http://internap.dl.sourceforge.net/sourceforge/kxml/kxml2-2.3.0.jar"
-    chmod a+rx *.jar
-  fi
+    DIR="rsync -avW --delete-after"
+    JAR="kxml2-2.3.0.jar"
+    if [ ! -f "$DEST/$JAR" ]; then
+        # Get the jar from ADT if we can, otherwise download it.
+        if [ -f "$DEST/../com.android.ide.eclipse.adt/$JAR" ]; then
+            cp "$DEST/../com.android.ide.eclipse.adt/$JAR" "$DEST/$JAR"
+        else
+            wget -O "$DEST/$JAR" "http://internap.dl.sourceforge.net/sourceforge/kxml/$JAR"
+        fi
+        chmod a+rx "$DEST/$JAR"
+    fi
 else
-  echo "Unsupported platform ($HOST). Nothing done."
+    echo "Unsupported platform ($HOST). Nothing done."
 fi
 
+# create link to ddmlib tests
+DEST=$BASE/unittests/com/android
+BACK=`back $DEST`
+$DIR $BACK/development/tools/ddms/libs/ddmlib/tests/src/com/android/ddmlib $DEST/
+