Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
diff --git a/eclipse/scripts/build_plugins.sh b/eclipse/scripts/build_plugins.sh
index 5f94ca0..1093fb2 100755
--- a/eclipse/scripts/build_plugins.sh
+++ b/eclipse/scripts/build_plugins.sh
@@ -2,7 +2,7 @@
# build script for eclipse adt build on linux platform
#
-# Usage: development/tools/eclipse/scripts/build_plugins <build_version>
+# Usage: sdk/eclipse/scripts/build_plugins <build_version>
#
# It expects environment variable ECLIPSE_HOME to be defined to point to _your_
# version of Eclipse RCP (must have the WTP & GEF plugins available too.)
@@ -59,10 +59,10 @@
HOST=`uname`
[ "$HOST" == "Linux" ] || die "ERROR: This script is currently only supported on Linux platform"
-# Make sure this runs from the tools/eclipse plugin.
+# Make sure this runs from the sdk/eclipse plugin.
D=`dirname "$0"`
cd "$D/.."
-[ `basename "$PWD"` == "eclipse" ] || dieWithUsage "Please run this script from the device/tools/eclipse directory"
+[ `basename "$PWD"` == "eclipse" ] || dieWithUsage "Please run this script from the sdk/eclipse directory"
# check for number of parameters
[ $# -lt 1 ] && dieWithUsage "ERROR: Not enough parameters"
diff --git a/eclipse/scripts/build_server.sh b/eclipse/scripts/build_server.sh
index 39c8dcd..cd4f1ac 100755
--- a/eclipse/scripts/build_server.sh
+++ b/eclipse/scripts/build_server.sh
@@ -49,7 +49,7 @@
# This needs to run from the top android directory
# Automatically CD to the top android directory, whatever its name
D=`dirname "$0"`
- cd "$D/../../../../" && echo "Switched to directory $PWD"
+ cd "$D/../../../" && echo "Switched to directory $PWD"
# The current Eclipse build has some Linux dependency in its config files
[ `uname` == "Linux" ] || die "This must run from a Linux box."
@@ -66,7 +66,7 @@
}
function build_plugin {
- development/tools/eclipse/scripts/create_all_symlinks.sh
+ sdk/eclipse/scripts/create_all_symlinks.sh
# Qualifier is "v" followed by date/time in YYYYMMDDHHSS format and the optional
# build number.
@@ -89,7 +89,7 @@
[ -d "$DEST_DIR/$BUILD_PREFIX" ] || rm -rfv "$DEST_DIR/$BUILD_PREFIX"
# Perform the Eclipse build and move the result in $DEST_DIR/android-build
- development/tools/eclipse/scripts/build_plugins.sh $QUALIFIER $INTERNAL_BUILD -d "$DEST_DIR" -a "$BUILD_PREFIX"
+ sdk/eclipse/scripts/build_plugins.sh $QUALIFIER $INTERNAL_BUILD -d "$DEST_DIR" -a "$BUILD_PREFIX"
# Cleanup
[ -d "$QUALIFIER" ] && rm -rfv "$QUALIFIER"
diff --git a/eclipse/scripts/create_adt_symlinks.sh b/eclipse/scripts/create_adt_symlinks.sh
index 1ceb192..9ea5e27 100755
--- a/eclipse/scripts/create_adt_symlinks.sh
+++ b/eclipse/scripts/create_adt_symlinks.sh
@@ -8,9 +8,9 @@
# CD to the top android directory
D=`dirname "$0"`
-cd "$D/../../../../"
+cd "$D/../../../"
-DEST="development/tools/eclipse/plugins/com.android.ide.eclipse.adt"
+DEST="sdk/eclipse/plugins/com.android.ide.eclipse.adt"
# computes "../.." from DEST to here (in /android)
BACK=`echo $DEST | sed 's@[^/]*@..@g'`
diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh
index dcbc5b3..db4673f 100755
--- a/eclipse/scripts/create_all_symlinks.sh
+++ b/eclipse/scripts/create_all_symlinks.sh
@@ -18,9 +18,9 @@
# CD to the top android directory
D=`dirname "$0"`
-cd "$D/../../../../"
+cd "$D/../../../"
-DEST="development/tools/eclipse/scripts"
+DEST="sdk/eclipse/scripts"
set -e # fail early
diff --git a/eclipse/scripts/create_bridge_symlinks.sh b/eclipse/scripts/create_bridge_symlinks.sh
index 605ef63..263dc20 100755
--- a/eclipse/scripts/create_bridge_symlinks.sh
+++ b/eclipse/scripts/create_bridge_symlinks.sh
@@ -8,7 +8,7 @@
# CD to the top android directory
D=`dirname "$0"`
-cd "$D/../../../../"
+cd "$D/../../../"
HOST=`uname`
if [ "$HOST" == "Linux" ]; then
@@ -19,7 +19,7 @@
elif [ "${HOST:0:6}" == "CYGWIN" ]; then
if [ "x$1" == "x" ] || [ `basename "$1"` != "layoutlib.jar" ]; then
- echo "Usage: $0 sdk/platforms/xxx/data/layoutlib.jar"
+ echo "Usage: $0 yoursdk/platforms/xxx/data/layoutlib.jar"
echo "Argument 1 should be the path to the layoutlib.jar that should be updated."
exit 1
fi
diff --git a/eclipse/scripts/create_ddms_symlinks.sh b/eclipse/scripts/create_ddms_symlinks.sh
index 87cdf68..614e8a3 100755
--- a/eclipse/scripts/create_ddms_symlinks.sh
+++ b/eclipse/scripts/create_ddms_symlinks.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#----------------------------------------------------------------------------|
# Creates the links to use ddm{ui}lib in the eclipse-ide plugin.
-# Run this from device/tools/eclipse/scripts
+# Run this from sdk/eclipse/scripts
#----------------------------------------------------------------------------|
set -e
@@ -37,10 +37,10 @@
# CD to the top android directory
D=`dirname "$0"`
-cd "$D/../../../../"
+cd "$D/../../../"
-BASE="development/tools/eclipse/plugins/com.android.ide.eclipse.ddms"
+BASE="sdk/eclipse/plugins/com.android.ide.eclipse.ddms"
DEST=$BASE/libs
mkdir -p $DEST
@@ -50,8 +50,8 @@
DEST=$BASE/src/com/android
mkdir -p $DEST
-for i in development/tools/ddms/libs/ddmlib/src/com/android/ddmlib \
- development/tools/ddms/libs/ddmuilib/src/com/android/ddmuilib ; do
+for i in sdk/ddms/libs/ddmlib/src/com/android/ddmlib \
+ sdk/ddms/libs/ddmuilib/src/com/android/ddmuilib ; do
cpdir $DEST $i
done
@@ -74,6 +74,6 @@
up.png \
v.png \
w.png warning.png ; do
- cpfile $DEST development/tools/ddms/libs/ddmuilib/src/resources/images/$i
+ cpfile $DEST sdk/ddms/libs/ddmuilib/src/resources/images/$i
done
diff --git a/eclipse/scripts/create_test_symlinks.sh b/eclipse/scripts/create_test_symlinks.sh
index 2b2405b..a7a3599 100755
--- a/eclipse/scripts/create_test_symlinks.sh
+++ b/eclipse/scripts/create_test_symlinks.sh
@@ -4,7 +4,7 @@
# CD to the top android directory
D=`dirname "$0"`
-cd "$D/../../../../"
+cd "$D/../../../"
# computes relative ".." paths from $1 to here (in /android)
function back() {
@@ -26,7 +26,7 @@
}
fi
-BASE="development/tools/eclipse/plugins/com.android.ide.eclipse.tests"
+BASE="sdk/eclipse/plugins/com.android.ide.eclipse.tests"
DEST=$BASE
BACK=`back $DEST`
@@ -66,8 +66,8 @@
# create link to ddmlib tests
DEST=$BASE/unittests/com/android
-cpdir $DEST development/tools/ddms/libs/ddmlib/tests/src/com/android/ddmlib
-cpdir $DEST development/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib
+cpdir $DEST sdk/ddms/libs/ddmlib/tests/src/com/android/ddmlib
+cpdir $DEST sdk/sdkmanager/libs/sdklib/tests/com/android/sdklib
DEST=$BASE/unittests/com/android/layoutlib
mkdir -p $DEST