eclair snapshot

tools/eclipse/scripts/create_test_symlinks.sh

@@ -15,6 +15,7 @@ HOST=`uname`
 if [ "${HOST:0:6}" == "CYGWIN" ]; then
     # We can't use symlinks under Cygwin
     function cpdir() { # $1=dest $2=source
+        echo "rsync $2 => $1"
         rsync -avW --delete-after $2 $1
     }
 
@@ -32,23 +33,46 @@ BACK=`back $DEST`
 HOST=`uname`
 if [ "$HOST" == "Linux" ]; then
     ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar "$DEST/"
+    ln -svf $BACK/out/host/linux-x86/framework/layoutlib.jar   "$DEST/"
 
 elif [ "$HOST" == "Darwin" ]; then
     ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar "$DEST/"
+    ln -svf $BACK/out/host/darwin-x86/framework/layoutlib.jar   "$DEST/"
 
 elif [ "${HOST:0:6}" == "CYGWIN" ]; then
-
     if [ ! -f "$DEST/kxml2-2.3.0.jar" ]; then
         cp -v "prebuilt/common/kxml2/kxml2-2.3.0.jar" "$DEST/"
-        chmod -v a+rx "$DEST"/*.jar
     fi
 
+    LIBS="layoutlib.jar"
+    NEED_MAKE="yes"
+    for LIB in $LIBS ; do
+        SRCJAR="out/host/windows-x86/framework/$LIB"
+        DSTJAR="$DEST/$LIB"
+        if [[ $NEED_MAKE ]] && ! diff -q "$SRCJAR" "$DSTJAR" >/dev/null ; then
+            MAKE_LIBS="${LIBS//.jar/}"
+            echo "Make java libs: $MAKE_LIBS"
+            make -j3 showcommands $MAKE_LIBS || die "adt-tests: Failed to build one of $LIBS."
+            NEED_MAKE=""
+        fi
+        
+        cp -v "$SRCJAR" "$DSTJAR"
+    done
+
+    chmod -v a+rx "$DEST"/*.jar
 else
     echo "Unsupported platform ($HOST). Nothing done."
 fi
 
 # create link to ddmlib tests
 DEST=$BASE/unittests/com/android
-BACK=`back $DEST`
 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