am 7afd643e: am 15ecb4b8: am 97eef6fd: Merge change Ifb00e723 into eclair

Merge commit '7afd643ebd3c0127b88502e6183fd6cccd38b185'

* commit '7afd643ebd3c0127b88502e6183fd6cccd38b185':
  Actively remove the obsolete sdkuilib symlink.
This commit is contained in:
Raphael
2009-10-15 15:41:39 -07:00
committed by Android Git Automerger

View File

@@ -69,8 +69,10 @@ 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
# 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