124 files changed, 16 insertions, 83 deletions

diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 962e96c..42167c7 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -18,13 +18,10 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_JAVA_LIBRARIES := core framework
 
 LOCAL_MODULE:= android.test.runner
 
 include $(BUILD_JAVA_LIBRARY)
-
-# additionally, build unit tests in a separate .apk
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test-runner/src/android/test/ActivityInstrumentationTestCase.java b/test-runner/android/test/ActivityInstrumentationTestCase.java
index d12ff6f..d12ff6f 100644
--- a/test-runner/src/android/test/ActivityInstrumentationTestCase.java
+++ b/test-runner/android/test/ActivityInstrumentationTestCase.java
diff --git a/test-runner/src/android/test/ActivityInstrumentationTestCase2.java b/test-runner/android/test/ActivityInstrumentationTestCase2.java
index e8570bd..e8570bd 100644
--- a/test-runner/src/android/test/ActivityInstrumentationTestCase2.java
+++ b/test-runner/android/test/ActivityInstrumentationTestCase2.java
diff --git a/test-runner/src/android/test/ActivityTestCase.java b/test-runner/android/test/ActivityTestCase.java
index 18bfccc..18bfccc 100644
--- a/test-runner/src/android/test/ActivityTestCase.java
+++ b/test-runner/android/test/ActivityTestCase.java
diff --git a/test-runner/src/android/test/ActivityUnitTestCase.java b/test-runner/android/test/ActivityUnitTestCase.java
index 6bd19a6..6bd19a6 100644
--- a/test-runner/src/android/test/ActivityUnitTestCase.java
+++ b/test-runner/android/test/ActivityUnitTestCase.java
diff --git a/test-runner/src/android/test/AndroidTestRunner.java b/test-runner/android/test/AndroidTestRunner.java
index fc9832c..fc9832c 100644
--- a/test-runner/src/android/test/AndroidTestRunner.java
+++ b/test-runner/android/test/AndroidTestRunner.java
diff --git a/test-runner/src/android/test/ApplicationTestCase.java b/test-runner/android/test/ApplicationTestCase.java
index ae5fa4d..ae5fa4d 100644
--- a/test-runner/src/android/test/ApplicationTestCase.java
+++ b/test-runner/android/test/ApplicationTestCase.java
diff --git a/test-runner/src/android/test/AssertionFailedError.java b/test-runner/android/test/AssertionFailedError.java
index 7af5806..7af5806 100644
--- a/test-runner/src/android/test/AssertionFailedError.java
+++ b/test-runner/android/test/AssertionFailedError.java
diff --git a/test-runner/src/android/test/BundlePrinter.java b/test-runner/android/test/BundlePrinter.java
index 96213e7..96213e7 100644
--- a/test-runner/src/android/test/BundlePrinter.java
+++ b/test-runner/android/test/BundlePrinter.java
diff --git a/test-runner/src/android/test/BundleTestListener.java b/test-runner/android/test/BundleTestListener.java
index 772713f..772713f 100644
--- a/test-runner/src/android/test/BundleTestListener.java
+++ b/test-runner/android/test/BundleTestListener.java
diff --git a/test-runner/src/android/test/ClassPathPackageInfo.java b/test-runner/android/test/ClassPathPackageInfo.java
index 1f6e647..1f6e647 100644
--- a/test-runner/src/android/test/ClassPathPackageInfo.java
+++ b/test-runner/android/test/ClassPathPackageInfo.java
diff --git a/test-runner/src/android/test/ClassPathPackageInfoSource.java b/test-runner/android/test/ClassPathPackageInfoSource.java
index 877075f..877075f 100644
--- a/test-runner/src/android/test/ClassPathPackageInfoSource.java
+++ b/test-runner/android/test/ClassPathPackageInfoSource.java
diff --git a/test-runner/src/android/test/ComparisonFailure.java b/test-runner/android/test/ComparisonFailure.java
index e7e9698..e7e9698 100644
--- a/test-runner/src/android/test/ComparisonFailure.java
+++ b/test-runner/android/test/ComparisonFailure.java
diff --git a/test-runner/src/android/test/DatabaseTestUtils.java b/test-runner/android/test/DatabaseTestUtils.java
index 23e0aba..23e0aba 100644
--- a/test-runner/src/android/test/DatabaseTestUtils.java
+++ b/test-runner/android/test/DatabaseTestUtils.java
diff --git a/test-runner/src/android/test/InstrumentationCoreTestRunner.java b/test-runner/android/test/InstrumentationCoreTestRunner.java
index ff99a74..ff99a74 100644
--- a/test-runner/src/android/test/InstrumentationCoreTestRunner.java
+++ b/test-runner/android/test/InstrumentationCoreTestRunner.java
diff --git a/test-runner/src/android/test/InstrumentationTestRunner.java b/test-runner/android/test/InstrumentationTestRunner.java
index 3e9cd9f..3e9cd9f 100644
--- a/test-runner/src/android/test/InstrumentationTestRunner.java
+++ b/test-runner/android/test/InstrumentationTestRunner.java
diff --git a/test-runner/src/android/test/InstrumentationUtils.java b/test-runner/android/test/InstrumentationUtils.java
index 4c59097..4c59097 100644
--- a/test-runner/src/android/test/InstrumentationUtils.java
+++ b/test-runner/android/test/InstrumentationUtils.java
diff --git a/test-runner/src/android/test/IsolatedContext.java b/test-runner/android/test/IsolatedContext.java
index 485e45c..485e45c 100644
--- a/test-runner/src/android/test/IsolatedContext.java
+++ b/test-runner/android/test/IsolatedContext.java
diff --git a/test-runner/src/android/test/LaunchPerformanceBase.java b/test-runner/android/test/LaunchPerformanceBase.java
index c324446..c324446 100644
--- a/test-runner/src/android/test/LaunchPerformanceBase.java
+++ b/test-runner/android/test/LaunchPerformanceBase.java
diff --git a/test-runner/src/android/test/MoreAsserts.java b/test-runner/android/test/MoreAsserts.java
index 9e0d018..9e0d018 100644
--- a/test-runner/src/android/test/MoreAsserts.java
+++ b/test-runner/android/test/MoreAsserts.java
diff --git a/test-runner/src/android/test/NoExecTestResult.java b/test-runner/android/test/NoExecTestResult.java
index 1ee62c1..1ee62c1 100755
--- a/test-runner/src/android/test/NoExecTestResult.java
+++ b/test-runner/android/test/NoExecTestResult.java
diff --git a/test-runner/src/android/test/PackageInfoSources.java b/test-runner/android/test/PackageInfoSources.java
index ef37449..ef37449 100644
--- a/test-runner/src/android/test/PackageInfoSources.java
+++ b/test-runner/android/test/PackageInfoSources.java
diff --git a/test-runner/src/android/test/PerformanceCollectorTestCase.java b/test-runner/android/test/PerformanceCollectorTestCase.java
index 4309ff7..4309ff7 100644
--- a/test-runner/src/android/test/PerformanceCollectorTestCase.java
+++ b/test-runner/android/test/PerformanceCollectorTestCase.java
diff --git a/test-runner/src/android/test/PerformanceTestBase.java b/test-runner/android/test/PerformanceTestBase.java
index 4a0a589..4a0a589 100644
--- a/test-runner/src/android/test/PerformanceTestBase.java
+++ b/test-runner/android/test/PerformanceTestBase.java
diff --git a/test-runner/src/android/test/ProviderTestCase.java b/test-runner/android/test/ProviderTestCase.java
index 668e9f7..668e9f7 100644
--- a/test-runner/src/android/test/ProviderTestCase.java
+++ b/test-runner/android/test/ProviderTestCase.java
diff --git a/test-runner/src/android/test/ProviderTestCase2.java b/test-runner/android/test/ProviderTestCase2.java
index f3655fc..f3655fc 100644
--- a/test-runner/src/android/test/ProviderTestCase2.java
+++ b/test-runner/android/test/ProviderTestCase2.java
diff --git a/test-runner/src/android/test/RenamingDelegatingContext.java b/test-runner/android/test/RenamingDelegatingContext.java
index 0ea43ab..0ea43ab 100644
--- a/test-runner/src/android/test/RenamingDelegatingContext.java
+++ b/test-runner/android/test/RenamingDelegatingContext.java
diff --git a/test-runner/src/android/test/ServiceLocator.java b/test-runner/android/test/ServiceLocator.java
index 3324008..3324008 100644
--- a/test-runner/src/android/test/ServiceLocator.java
+++ b/test-runner/android/test/ServiceLocator.java
diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/android/test/ServiceTestCase.java
index fcb9d55..fcb9d55 100644
--- a/test-runner/src/android/test/ServiceTestCase.java
+++ b/test-runner/android/test/ServiceTestCase.java
diff --git a/test-runner/src/android/test/SimpleCache.java b/test-runner/android/test/SimpleCache.java
index 44424ec..44424ec 100644
--- a/test-runner/src/android/test/SimpleCache.java
+++ b/test-runner/android/test/SimpleCache.java
diff --git a/test-runner/src/android/test/SingleLaunchActivityTestCase.java b/test-runner/android/test/SingleLaunchActivityTestCase.java
index b63b3ce..b63b3ce 100644
--- a/test-runner/src/android/test/SingleLaunchActivityTestCase.java
+++ b/test-runner/android/test/SingleLaunchActivityTestCase.java
diff --git a/test-runner/src/android/test/SyncBaseInstrumentation.java b/test-runner/android/test/SyncBaseInstrumentation.java
index 7d418f0..7d418f0 100644
--- a/test-runner/src/android/test/SyncBaseInstrumentation.java
+++ b/test-runner/android/test/SyncBaseInstrumentation.java
diff --git a/test-runner/src/android/test/TestBrowserActivity.java b/test-runner/android/test/TestBrowserActivity.java
index ea5f91e..ea5f91e 100644
--- a/test-runner/src/android/test/TestBrowserActivity.java
+++ b/test-runner/android/test/TestBrowserActivity.java
diff --git a/test-runner/src/android/test/TestBrowserController.java b/test-runner/android/test/TestBrowserController.java
index 044e39f..044e39f 100644
--- a/test-runner/src/android/test/TestBrowserController.java
+++ b/test-runner/android/test/TestBrowserController.java
diff --git a/test-runner/src/android/test/TestBrowserControllerImpl.java b/test-runner/android/test/TestBrowserControllerImpl.java
index b8f8975..b8f8975 100644
--- a/test-runner/src/android/test/TestBrowserControllerImpl.java
+++ b/test-runner/android/test/TestBrowserControllerImpl.java
diff --git a/test-runner/src/android/test/TestBrowserView.java b/test-runner/android/test/TestBrowserView.java
index 4799f19..4799f19 100644
--- a/test-runner/src/android/test/TestBrowserView.java
+++ b/test-runner/android/test/TestBrowserView.java
diff --git a/test-runner/src/android/test/TestCase.java b/test-runner/android/test/TestCase.java
index 5432ce8..5432ce8 100644
--- a/test-runner/src/android/test/TestCase.java
+++ b/test-runner/android/test/TestCase.java
diff --git a/test-runner/src/android/test/TestCaseUtil.java b/test-runner/android/test/TestCaseUtil.java
index 3ba9711..3ba9711 100644
--- a/test-runner/src/android/test/TestCaseUtil.java
+++ b/test-runner/android/test/TestCaseUtil.java
diff --git a/test-runner/src/android/test/TestListActivity.java b/test-runner/android/test/TestListActivity.java
index a076a70..a076a70 100644
--- a/test-runner/src/android/test/TestListActivity.java
+++ b/test-runner/android/test/TestListActivity.java
diff --git a/test-runner/src/android/test/TestPrinter.java b/test-runner/android/test/TestPrinter.java
index 37bd721..37bd721 100644
--- a/test-runner/src/android/test/TestPrinter.java
+++ b/test-runner/android/test/TestPrinter.java
diff --git a/test-runner/src/android/test/TestRecorder.java b/test-runner/android/test/TestRecorder.java
index 7c368a0..7c368a0 100644
--- a/test-runner/src/android/test/TestRecorder.java
+++ b/test-runner/android/test/TestRecorder.java
diff --git a/test-runner/src/android/test/TestRunner.java b/test-runner/android/test/TestRunner.java
index 012df35..012df35 100644
--- a/test-runner/src/android/test/TestRunner.java
+++ b/test-runner/android/test/TestRunner.java
diff --git a/test-runner/src/android/test/TestRunnerView.java b/test-runner/android/test/TestRunnerView.java
index be90951..be90951 100644
--- a/test-runner/src/android/test/TestRunnerView.java
+++ b/test-runner/android/test/TestRunnerView.java
diff --git a/test-runner/src/android/test/TestSuiteProvider.java b/test-runner/android/test/TestSuiteProvider.java
index dc9ce6e..dc9ce6e 100644
--- a/test-runner/src/android/test/TestSuiteProvider.java
+++ b/test-runner/android/test/TestSuiteProvider.java
diff --git a/test-runner/src/android/test/TimedTest.java b/test-runner/android/test/TimedTest.java
index 95cc9bf..95cc9bf 100644
--- a/test-runner/src/android/test/TimedTest.java
+++ b/test-runner/android/test/TimedTest.java
diff --git a/test-runner/src/android/test/TouchUtils.java b/test-runner/android/test/TouchUtils.java
index 69c6d2d..69c6d2d 100644
--- a/test-runner/src/android/test/TouchUtils.java
+++ b/test-runner/android/test/TouchUtils.java
diff --git a/test-runner/src/android/test/ViewAsserts.java b/test-runner/android/test/ViewAsserts.java
index c575fc5..c575fc5 100644
--- a/test-runner/src/android/test/ViewAsserts.java
+++ b/test-runner/android/test/ViewAsserts.java
diff --git a/test-runner/src/android/test/mock/MockApplication.java b/test-runner/android/test/mock/MockApplication.java
index 572dfbf..572dfbf 100644
--- a/test-runner/src/android/test/mock/MockApplication.java
+++ b/test-runner/android/test/mock/MockApplication.java
diff --git a/test-runner/src/android/test/mock/MockContentProvider.java b/test-runner/android/test/mock/MockContentProvider.java
index 4078622..4078622 100644
--- a/test-runner/src/android/test/mock/MockContentProvider.java
+++ b/test-runner/android/test/mock/MockContentProvider.java
diff --git a/test-runner/src/android/test/mock/MockContentResolver.java b/test-runner/android/test/mock/MockContentResolver.java
index 3a1dc36c..3a1dc36c 100644
--- a/test-runner/src/android/test/mock/MockContentResolver.java
+++ b/test-runner/android/test/mock/MockContentResolver.java
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/android/test/mock/MockContext.java
index ffd757c..ffd757c 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/android/test/mock/MockContext.java
diff --git a/test-runner/src/android/test/mock/MockCursor.java b/test-runner/android/test/mock/MockCursor.java
index 9b1c0ef..9b1c0ef 100644
--- a/test-runner/src/android/test/mock/MockCursor.java
+++ b/test-runner/android/test/mock/MockCursor.java
diff --git a/test-runner/src/android/test/mock/MockDialogInterface.java b/test-runner/android/test/mock/MockDialogInterface.java
index e4dd0ba..e4dd0ba 100644
--- a/test-runner/src/android/test/mock/MockDialogInterface.java
+++ b/test-runner/android/test/mock/MockDialogInterface.java
diff --git a/test-runner/src/android/test/mock/MockIContentProvider.java b/test-runner/android/test/mock/MockIContentProvider.java
index 7c0a1e2..7c0a1e2 100644
--- a/test-runner/src/android/test/mock/MockIContentProvider.java
+++ b/test-runner/android/test/mock/MockIContentProvider.java
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/android/test/mock/MockPackageManager.java
index f1ba44a..f1ba44a 100644
--- a/test-runner/src/android/test/mock/MockPackageManager.java
+++ b/test-runner/android/test/mock/MockPackageManager.java
diff --git a/test-runner/src/android/test/mock/MockResources.java b/test-runner/android/test/mock/MockResources.java
index 18752ce..18752ce 100644
--- a/test-runner/src/android/test/mock/MockResources.java
+++ b/test-runner/android/test/mock/MockResources.java
diff --git a/test-runner/src/android/test/mock/package.html b/test-runner/android/test/mock/package.html
index 0f1bc6f4..0f1bc6f4 100644
--- a/test-runner/src/android/test/mock/package.html
+++ b/test-runner/android/test/mock/package.html
diff --git a/test-runner/src/android/test/suitebuilder/AssignableFrom.java b/test-runner/android/test/suitebuilder/AssignableFrom.java
index 38b4ee3..38b4ee3 100644
--- a/test-runner/src/android/test/suitebuilder/AssignableFrom.java
+++ b/test-runner/android/test/suitebuilder/AssignableFrom.java
diff --git a/test-runner/src/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java b/test-runner/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java
index 128396e..128396e 100644
--- a/test-runner/src/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java
+++ b/test-runner/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java
diff --git a/test-runner/src/android/test/suitebuilder/SmokeTestSuiteBuilder.java b/test-runner/android/test/suitebuilder/SmokeTestSuiteBuilder.java
index 01e7ec6..01e7ec6 100644
--- a/test-runner/src/android/test/suitebuilder/SmokeTestSuiteBuilder.java
+++ b/test-runner/android/test/suitebuilder/SmokeTestSuiteBuilder.java
diff --git a/test-runner/src/android/test/suitebuilder/TestGrouping.java b/test-runner/android/test/suitebuilder/TestGrouping.java
index df6da70..df6da70 100644
--- a/test-runner/src/android/test/suitebuilder/TestGrouping.java
+++ b/test-runner/android/test/suitebuilder/TestGrouping.java
diff --git a/test-runner/src/android/test/suitebuilder/TestMethod.java b/test-runner/android/test/suitebuilder/TestMethod.java
index 08568d5..08568d5 100644
--- a/test-runner/src/android/test/suitebuilder/TestMethod.java
+++ b/test-runner/android/test/suitebuilder/TestMethod.java
diff --git a/test-runner/src/android/test/suitebuilder/TestPredicates.java b/test-runner/android/test/suitebuilder/TestPredicates.java
index d814e0b..d814e0b 100644
--- a/test-runner/src/android/test/suitebuilder/TestPredicates.java
+++ b/test-runner/android/test/suitebuilder/TestPredicates.java
diff --git a/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java b/test-runner/android/test/suitebuilder/TestSuiteBuilder.java
index 428905e..428905e 100644
--- a/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java
+++ b/test-runner/android/test/suitebuilder/TestSuiteBuilder.java
diff --git a/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java b/test-runner/android/test/suitebuilder/UnitTestSuiteBuilder.java
index 8cf4c86..8cf4c86 100644
--- a/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java
+++ b/test-runner/android/test/suitebuilder/UnitTestSuiteBuilder.java
diff --git a/test-runner/src/android/test/suitebuilder/annotation/HasAnnotation.java b/test-runner/android/test/suitebuilder/annotation/HasAnnotation.java
index a2868fc..a2868fc 100644
--- a/test-runner/src/android/test/suitebuilder/annotation/HasAnnotation.java
+++ b/test-runner/android/test/suitebuilder/annotation/HasAnnotation.java
diff --git a/test-runner/src/android/test/suitebuilder/annotation/HasClassAnnotation.java b/test-runner/android/test/suitebuilder/annotation/HasClassAnnotation.java
index ac76f4c..ac76f4c 100644
--- a/test-runner/src/android/test/suitebuilder/annotation/HasClassAnnotation.java
+++ b/test-runner/android/test/suitebuilder/annotation/HasClassAnnotation.java
diff --git a/test-runner/src/android/test/suitebuilder/annotation/HasMethodAnnotation.java b/test-runner/android/test/suitebuilder/annotation/HasMethodAnnotation.java
index 96bd922..96bd922 100644
--- a/test-runner/src/android/test/suitebuilder/annotation/HasMethodAnnotation.java
+++ b/test-runner/android/test/suitebuilder/annotation/HasMethodAnnotation.java
diff --git a/test-runner/src/android/test/suitebuilder/annotation/package.html b/test-runner/android/test/suitebuilder/annotation/package.html
index ffba2e9..ffba2e9 100644
--- a/test-runner/src/android/test/suitebuilder/annotation/package.html
+++ b/test-runner/android/test/suitebuilder/annotation/package.html
diff --git a/test-runner/src/android/test/suitebuilder/package.html b/test-runner/android/test/suitebuilder/package.html
index ffba2e9..ffba2e9 100644
--- a/test-runner/src/android/test/suitebuilder/package.html
+++ b/test-runner/android/test/suitebuilder/package.html
diff --git a/test-runner/src/junit/MODULE_LICENSE_CPL b/test-runner/junit/MODULE_LICENSE_CPL
index 541dbb5..541dbb5 100644
--- a/test-runner/src/junit/MODULE_LICENSE_CPL
+++ b/test-runner/junit/MODULE_LICENSE_CPL
diff --git a/test-runner/src/junit/runner/BaseTestRunner.java b/test-runner/junit/runner/BaseTestRunner.java
index e073ef7..e073ef7 100644
--- a/test-runner/src/junit/runner/BaseTestRunner.java
+++ b/test-runner/junit/runner/BaseTestRunner.java
diff --git a/test-runner/src/junit/runner/ClassPathTestCollector.java b/test-runner/junit/runner/ClassPathTestCollector.java
index 8a3c702..8a3c702 100644
--- a/test-runner/src/junit/runner/ClassPathTestCollector.java
+++ b/test-runner/junit/runner/ClassPathTestCollector.java
diff --git a/test-runner/src/junit/runner/FailureDetailView.java b/test-runner/junit/runner/FailureDetailView.java
index 7108cec..7108cec 100644
--- a/test-runner/src/junit/runner/FailureDetailView.java
+++ b/test-runner/junit/runner/FailureDetailView.java
diff --git a/test-runner/src/junit/runner/LoadingTestCollector.java b/test-runner/junit/runner/LoadingTestCollector.java
index b1760b1..b1760b1 100644
--- a/test-runner/src/junit/runner/LoadingTestCollector.java
+++ b/test-runner/junit/runner/LoadingTestCollector.java
diff --git a/test-runner/src/junit/runner/ReloadingTestSuiteLoader.java b/test-runner/junit/runner/ReloadingTestSuiteLoader.java
index a6d84fe..a6d84fe 100644
--- a/test-runner/src/junit/runner/ReloadingTestSuiteLoader.java
+++ b/test-runner/junit/runner/ReloadingTestSuiteLoader.java
diff --git a/test-runner/src/junit/runner/SimpleTestCollector.java b/test-runner/junit/runner/SimpleTestCollector.java
index 543168f..543168f 100644
--- a/test-runner/src/junit/runner/SimpleTestCollector.java
+++ b/test-runner/junit/runner/SimpleTestCollector.java
diff --git a/test-runner/src/junit/runner/Sorter.java b/test-runner/junit/runner/Sorter.java
index 66f551e..66f551e 100644
--- a/test-runner/src/junit/runner/Sorter.java
+++ b/test-runner/junit/runner/Sorter.java
diff --git a/test-runner/src/junit/runner/StandardTestSuiteLoader.java b/test-runner/junit/runner/StandardTestSuiteLoader.java
index bce7dec..bce7dec 100644
--- a/test-runner/src/junit/runner/StandardTestSuiteLoader.java
+++ b/test-runner/junit/runner/StandardTestSuiteLoader.java
diff --git a/test-runner/src/junit/runner/TestCaseClassLoader.java b/test-runner/junit/runner/TestCaseClassLoader.java
index 3a510c6..3a510c6 100644
--- a/test-runner/src/junit/runner/TestCaseClassLoader.java
+++ b/test-runner/junit/runner/TestCaseClassLoader.java
diff --git a/test-runner/src/junit/runner/TestCollector.java b/test-runner/junit/runner/TestCollector.java
index 208dccd..208dccd 100644
--- a/test-runner/src/junit/runner/TestCollector.java
+++ b/test-runner/junit/runner/TestCollector.java
diff --git a/test-runner/src/junit/runner/TestRunListener.java b/test-runner/junit/runner/TestRunListener.java
index 0e95819..0e95819 100644
--- a/test-runner/src/junit/runner/TestRunListener.java
+++ b/test-runner/junit/runner/TestRunListener.java
diff --git a/test-runner/src/junit/runner/TestSuiteLoader.java b/test-runner/junit/runner/TestSuiteLoader.java
index 39a4cf7..39a4cf7 100644
--- a/test-runner/src/junit/runner/TestSuiteLoader.java
+++ b/test-runner/junit/runner/TestSuiteLoader.java
diff --git a/test-runner/src/junit/runner/Version.java b/test-runner/junit/runner/Version.java
index b4541ab..b4541ab 100644
--- a/test-runner/src/junit/runner/Version.java
+++ b/test-runner/junit/runner/Version.java
diff --git a/test-runner/src/junit/runner/excluded.properties b/test-runner/junit/runner/excluded.properties
index 3284628..3284628 100644
--- a/test-runner/src/junit/runner/excluded.properties
+++ b/test-runner/junit/runner/excluded.properties
diff --git a/test-runner/src/junit/runner/logo.gif b/test-runner/junit/runner/logo.gif
index d0e1547..d0e1547 100644
--- a/test-runner/src/junit/runner/logo.gif
+++ b/test-runner/junit/runner/logo.gif
diff --git a/test-runner/src/junit/runner/package.html b/test-runner/junit/runner/package.html
index f08fa70..f08fa70 100644
--- a/test-runner/src/junit/runner/package.html
+++ b/test-runner/junit/runner/package.html
diff --git a/test-runner/src/junit/runner/smalllogo.gif b/test-runner/junit/runner/smalllogo.gif
index 7b25eaf6..7b25eaf6 100644
--- a/test-runner/src/junit/runner/smalllogo.gif
+++ b/test-runner/junit/runner/smalllogo.gif
diff --git a/test-runner/src/junit/textui/ResultPrinter.java b/test-runner/junit/textui/ResultPrinter.java
index 5c97112..5c97112 100644
--- a/test-runner/src/junit/textui/ResultPrinter.java
+++ b/test-runner/junit/textui/ResultPrinter.java
diff --git a/test-runner/src/junit/textui/TestRunner.java b/test-runner/junit/textui/TestRunner.java
index 8bdc325..8bdc325 100644
--- a/test-runner/src/junit/textui/TestRunner.java
+++ b/test-runner/junit/textui/TestRunner.java
diff --git a/test-runner/src/junit/textui/package.html b/test-runner/junit/textui/package.html
index 723f2ae..723f2ae 100644
--- a/test-runner/src/junit/textui/package.html
+++ b/test-runner/junit/textui/package.html
diff --git a/test-runner/tests/Android.mk b/test-runner/tests/Android.mk
deleted file mode 100644
index d1efe7b..0000000
--- a/test-runner/tests/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2010, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := FrameworkTestRunnerTests
-
-include $(BUILD_PACKAGE)
-
diff --git a/test-runner/tests/AndroidManifest.xml b/test-runner/tests/AndroidManifest.xml
deleted file mode 100644
index 4f32392..0000000
--- a/test-runner/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.frameworks.testrunner.tests">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="android.test.StubTestBrowserActivity"
-            android:label="Stubbed Test Browser">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FOR_TESTS_ONLY"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.test.TestBrowserTests"
-            android:label="Test Browser Tests">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.UNIT_TEST"/>
-            </intent-filter>
-        </activity>`
-    </application>
-
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.android.frameworks.testrunner.tests"
-        android:label="Framework testrunner tests" />
-</manifest>
diff --git a/tests/CoreTests/android/AndroidManifest.xml b/tests/CoreTests/android/AndroidManifest.xml
index f02673c..98cc9e5 100644
--- a/tests/CoreTests/android/AndroidManifest.xml
+++ b/tests/CoreTests/android/AndroidManifest.xml
@@ -34,6 +34,19 @@
     
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="StubTestBrowserActivity" android:label="Stubbed Test Browser">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FOR_TESTS_ONLY"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.test.TestBrowserTests" android:label="Test Browser Tests">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.UNIT_TEST"/>
+            </intent-filter>
+        </activity>
     </application>
 
     <instrumentation
diff --git a/test-runner/tests/src/android/test/AndroidTestRunnerTest.java b/tests/CoreTests/android/test/AndroidTestRunnerTest.java
index 0574704..0574704 100644
--- a/test-runner/tests/src/android/test/AndroidTestRunnerTest.java
+++ b/tests/CoreTests/android/test/AndroidTestRunnerTest.java
diff --git a/test-runner/tests/src/android/test/InstrumentationTestRunnerTest.java b/tests/CoreTests/android/test/InstrumentationTestRunnerTest.java
index d9afd54..d9afd54 100644
--- a/test-runner/tests/src/android/test/InstrumentationTestRunnerTest.java
+++ b/tests/CoreTests/android/test/InstrumentationTestRunnerTest.java
diff --git a/test-runner/tests/src/android/test/StubTestBrowserActivity.java b/tests/CoreTests/android/test/StubTestBrowserActivity.java
index 97ed3ce..97ed3ce 100644
--- a/test-runner/tests/src/android/test/StubTestBrowserActivity.java
+++ b/tests/CoreTests/android/test/StubTestBrowserActivity.java
diff --git a/test-runner/tests/src/android/test/TestBrowserActivityTest.java b/tests/CoreTests/android/test/TestBrowserActivityTest.java
index 355409e..6afbe37 100644
--- a/test-runner/tests/src/android/test/TestBrowserActivityTest.java
+++ b/tests/CoreTests/android/test/TestBrowserActivityTest.java
@@ -215,24 +215,19 @@ public class TestBrowserActivityTest extends InstrumentationTestCase {
     }
 
     private TestBrowserActivity createActivity() throws RemoteException {
-        return launchActivity(getAndroidPackageName(), StubTestBrowserActivity.class, null);
+        return launchActivity("android.test", StubTestBrowserActivity.class, null);
     }
 
     private Intent createIntent(TestSuite testSuite) {
         Intent intent = new Intent(Intent.ACTION_RUN);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         String className = StubTestBrowserActivity.class.getName();
-        String packageName = getAndroidPackageName();
+        String packageName = className.substring(0, className.lastIndexOf("."));
         intent.setClassName(packageName, className);
         intent.setData(Uri.parse(testSuite.getName()));
         return intent;
     }
 
-    private String getAndroidPackageName() {
-        String packageName = getInstrumentation().getTargetContext().getPackageName();
-        return packageName;
-    }
-
     private TestBrowserActivity launchTestBrowserActivity(TestSuite testSuite)
             throws RemoteException {
         getInstrumentation().setInTouchMode(false);
diff --git a/test-runner/tests/src/android/test/TestBrowserControllerImplTest.java b/tests/CoreTests/android/test/TestBrowserControllerImplTest.java
index 1315606..1315606 100644
--- a/test-runner/tests/src/android/test/TestBrowserControllerImplTest.java
+++ b/tests/CoreTests/android/test/TestBrowserControllerImplTest.java
diff --git a/test-runner/tests/src/android/test/TestBrowserTests.java b/tests/CoreTests/android/test/TestBrowserTests.java
index 535e2f8..535e2f8 100644
--- a/test-runner/tests/src/android/test/TestBrowserTests.java
+++ b/tests/CoreTests/android/test/TestBrowserTests.java
diff --git a/test-runner/tests/src/android/test/TestCaseUtilTest.java b/tests/CoreTests/android/test/TestCaseUtilTest.java
index bc6fa92..bc6fa92 100644
--- a/test-runner/tests/src/android/test/TestCaseUtilTest.java
+++ b/tests/CoreTests/android/test/TestCaseUtilTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/AssignableFromTest.java b/tests/CoreTests/android/test/suitebuilder/AssignableFromTest.java
index 0f73e89..0f73e89 100644
--- a/test-runner/tests/src/android/test/suitebuilder/AssignableFromTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/AssignableFromTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java b/tests/CoreTests/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java
index 1872803..1872803 100644
--- a/test-runner/tests/src/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/ListTestCaseNames.java b/tests/CoreTests/android/test/suitebuilder/ListTestCaseNames.java
index 37ec328..37ec328 100644
--- a/test-runner/tests/src/android/test/suitebuilder/ListTestCaseNames.java
+++ b/tests/CoreTests/android/test/suitebuilder/ListTestCaseNames.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java b/tests/CoreTests/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java
index f817297..f817297 100644
--- a/test-runner/tests/src/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/TestSuiteBuilderTest.java b/tests/CoreTests/android/test/suitebuilder/TestSuiteBuilderTest.java
index 293c813..293c813 100644
--- a/test-runner/tests/src/android/test/suitebuilder/TestSuiteBuilderTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/TestSuiteBuilderTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/UnitTestSuiteBuilderTest.java b/tests/CoreTests/android/test/suitebuilder/UnitTestSuiteBuilderTest.java
index 469938e..469938e 100644
--- a/test-runner/tests/src/android/test/suitebuilder/UnitTestSuiteBuilderTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/UnitTestSuiteBuilderTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/annotation/HasAnnotationTest.java b/tests/CoreTests/android/test/suitebuilder/annotation/HasAnnotationTest.java
index edf067d..edf067d 100644
--- a/test-runner/tests/src/android/test/suitebuilder/annotation/HasAnnotationTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/annotation/HasAnnotationTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/annotation/HasClassAnnotationTest.java b/tests/CoreTests/android/test/suitebuilder/annotation/HasClassAnnotationTest.java
index 051ea54..051ea54 100644
--- a/test-runner/tests/src/android/test/suitebuilder/annotation/HasClassAnnotationTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/annotation/HasClassAnnotationTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java b/tests/CoreTests/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java
index c864e28..c864e28 100644
--- a/test-runner/tests/src/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/OuterTest.java b/tests/CoreTests/android/test/suitebuilder/examples/OuterTest.java
index 4659bf9..4659bf9 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/OuterTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/OuterTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/error/ErrorTest.java b/tests/CoreTests/android/test/suitebuilder/examples/error/ErrorTest.java
index f1f6113..f1f6113 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/error/ErrorTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/error/ErrorTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/error/FailingTest.java b/tests/CoreTests/android/test/suitebuilder/examples/error/FailingTest.java
index 428fd23..428fd23 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/error/FailingTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/error/FailingTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java b/tests/CoreTests/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java
index 5158a90..5158a90 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/nested/Level1Test.java b/tests/CoreTests/android/test/suitebuilder/examples/nested/Level1Test.java
index 17d39d6..17d39d6 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/nested/Level1Test.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/nested/Level1Test.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/nested/nested/Level2Test.java b/tests/CoreTests/android/test/suitebuilder/examples/nested/nested/Level2Test.java
index 6f0daca..6f0daca 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/nested/nested/Level2Test.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/nested/nested/Level2Test.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java b/tests/CoreTests/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java
index 0dfeda8..0dfeda8 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/simple/SimpleTest.java b/tests/CoreTests/android/test/suitebuilder/examples/simple/SimpleTest.java
index 4dcac44..4dcac44 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/simple/SimpleTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/simple/SimpleTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/smoke/NonSmokeTest.java b/tests/CoreTests/android/test/suitebuilder/examples/smoke/NonSmokeTest.java
index 1512ba7..1512ba7 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/smoke/NonSmokeTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/smoke/NonSmokeTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/smoke/SmokeTest.java b/tests/CoreTests/android/test/suitebuilder/examples/smoke/SmokeTest.java
index c3515df..c3515df 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/smoke/SmokeTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/smoke/SmokeTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SubclassTest.java b/tests/CoreTests/android/test/suitebuilder/examples/subclass/SubclassTest.java
index 0ab8c72..0ab8c72 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SubclassTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/subclass/SubclassTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SuperclassTest.java b/tests/CoreTests/android/test/suitebuilder/examples/subclass/SuperclassTest.java
index 05513c5..05513c5 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SuperclassTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/subclass/SuperclassTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java b/tests/CoreTests/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java
index 3ca0f70..3ca0f70 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java
diff --git a/test-runner/tests/src/android/test/suitebuilder/examples/suppress/SuppressedTest.java b/tests/CoreTests/android/test/suitebuilder/examples/suppress/SuppressedTest.java
index c4e0e07..c4e0e07 100644
--- a/test-runner/tests/src/android/test/suitebuilder/examples/suppress/SuppressedTest.java
+++ b/tests/CoreTests/android/test/suitebuilder/examples/suppress/SuppressedTest.java