Retry test-runner tests move.

This time change the frameworks makefile so it only includes test-runner/src in the public API.

Retry test-runner tests move.
This time change the frameworks makefile so it only includes test-runner/src in the public API.
e70f61b1 · Brett Chabot · fda25347 · e70f61b1 · e70f61b1 · e70f61b1
Commit e70f61b1 authored 15 years ago by Brett Chabot
20 changed files
--- a/Android.mk
+++ b/Android.mk
@@ -276,7 +276,7 @@ packages_to_document := \
 # Search through the base framework dirs for these packages.
 # The result will be relative to frameworks/base.
 fwbase_dirs_to_document := \
-	test-runner \
+	test-runner/src \
 	$(patsubst $(LOCAL_PATH)/%,%, \
 	  $(wildcard \
 	    $(foreach dir, $(FRAMEWORKS_BASE_JAVA_SRC_DIRS), \

--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -18,10 +18,13 @@ LOCAL_PATH:= $(call my-dir)

 include $(CLEAR_VARS)

-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)

 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))
--- a/test-runner/android/test/ActivityInstrumentationTestCase.java
+++ b/test-runner/android/test/ActivityInstrumentationTestCase.java
--- a/test-runner/android/test/ActivityInstrumentationTestCase2.java
+++ b/test-runner/android/test/ActivityInstrumentationTestCase2.java
--- a/test-runner/android/test/ActivityTestCase.java
+++ b/test-runner/android/test/ActivityTestCase.java
--- a/test-runner/android/test/ActivityUnitTestCase.java
+++ b/test-runner/android/test/ActivityUnitTestCase.java
--- a/test-runner/android/test/AndroidTestRunner.java
+++ b/test-runner/android/test/AndroidTestRunner.java
--- a/test-runner/android/test/ApplicationTestCase.java
+++ b/test-runner/android/test/ApplicationTestCase.java
--- a/test-runner/android/test/AssertionFailedError.java
+++ b/test-runner/android/test/AssertionFailedError.java
--- a/test-runner/android/test/BundlePrinter.java
+++ b/test-runner/android/test/BundlePrinter.java
--- a/test-runner/android/test/BundleTestListener.java
+++ b/test-runner/android/test/BundleTestListener.java
--- a/test-runner/android/test/ClassPathPackageInfo.java
+++ b/test-runner/android/test/ClassPathPackageInfo.java
--- a/test-runner/android/test/ClassPathPackageInfoSource.java
+++ b/test-runner/android/test/ClassPathPackageInfoSource.java
--- a/test-runner/android/test/ComparisonFailure.java
+++ b/test-runner/android/test/ComparisonFailure.java
--- a/test-runner/android/test/DatabaseTestUtils.java
+++ b/test-runner/android/test/DatabaseTestUtils.java
--- a/test-runner/android/test/InstrumentationCoreTestRunner.java
+++ b/test-runner/android/test/InstrumentationCoreTestRunner.java
--- a/test-runner/android/test/InstrumentationTestRunner.java
+++ b/test-runner/android/test/InstrumentationTestRunner.java
--- a/test-runner/android/test/InstrumentationUtils.java
+++ b/test-runner/android/test/InstrumentationUtils.java
--- a/test-runner/android/test/IsolatedContext.java
+++ b/test-runner/android/test/IsolatedContext.java
--- a/test-runner/android/test/LaunchPerformanceBase.java
+++ b/test-runner/android/test/LaunchPerformanceBase.java