OSDN Git Service

am f1d64e29: Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
authorRaphael <raphael@google.com>
Thu, 19 Nov 2009 01:12:02 +0000 (17:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Nov 2009 01:12:02 +0000 (17:12 -0800)
Merge commit 'f1d64e2975451e3bbbcd2e62a03a717308db500a' into eclair

* commit 'f1d64e2975451e3bbbcd2e62a03a717308db500a':
  Fix the sdk/scritps/create_*_symlinks for the new SDK git project.

1  2 
eclipse/scripts/create_test_symlinks.sh

@@@ -4,7 -4,7 +4,7 @@@ set -
  
  # 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 +26,7 @@@ els
      }
  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,13 -66,11 +66,13 @@@ f
  
  # 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
  
 +# Cleanup old obsolete symlink
 +[[ -e $DEST/sdkuilib || -L $DEST/sdkuilib ]] && rm -rfv $DEST/sdkuilib
 +
  DEST=$BASE/unittests/com/android/layoutlib
  mkdir -p $DEST
  cpdir $DEST frameworks/base/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge
  cpdir $DEST frameworks/base/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata
 -