am b5c18403: Merge change Idc3d3b2f into eclair

Merge commit 'b5c1840392bf93edd8caaefb7136b46f2b369773' into eclair-mr2

* commit 'b5c1840392bf93edd8caaefb7136b46f2b369773':
  Moved the test data to their own package.

tools/eclipse/plugins/com.android.ide.eclipse.tests/build.properties

@@ -10,4 +10,6 @@ bin.includes = META-INF/,\
                unittests/data/,\
                sdklib.jar,\
                layoutlib_api.jar,\
-               layoutlib.jar
+               layoutlib.jar,\
+               unittests/com/android/sdklib/testdata/,\
+               unittests/com/android/layoutlib/testdata/

tools/eclipse/scripts/create_test_symlinks.sh

@@ -57,4 +57,5 @@ cpdir $DEST development/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib
 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
 

tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java

@@ -123,9 +123,9 @@ public class TestSdkRepository extends TestCase {
 
     /** Validate a valid sample using an InputStream */
     public void testValidateLocalRepositoryFile() throws Exception {
-
         InputStream xmlStream =
-            TestSdkRepository.class.getResourceAsStream("repository_sample.xml");
+            TestSdkRepository.class.getResourceAsStream(
+                    "/com/android/sdklib/testdata/repository_sample.xml");
         Source source = new StreamSource(xmlStream);
 
         CaptureErrorHandler handler = new CaptureErrorHandler();