Remove non-junit android.test.base classes from android.jar
This removes those android.test.** classes which are part of the
android.test.base stubs jar from the main android.jar.
The junit classes will be removed at a later date. It cannot be done at
the moment because it requires a lot of changes to the build files.
This change is being done now rather than wait until they can all be
removed together because the code base is a moving target. Doing this
change minimizes the window during which other developers could either
revert the previous changes that make this possible or add new code that
relies on the android.test.base classes being in android.jar and so
would require yet more changes.
Bug: 30188076
Test: make checkbuild
Change-Id: I9a4df968835166cc3d30c076ef3036711dfe5b7f
diff --git a/Android.mk b/Android.mk
index 1035362..00f877a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -274,6 +274,9 @@
../opt/net/voip/src/java/android/net/rtp \
../opt/net/voip/src/java/android/net/sip \
+framework_base_android_test_base_src_files := \
+ $(call all-java-files-under, test-base/src/junit)
+
framework_base_android_test_mock_src_files := \
$(call all-java-files-under, test-mock/src/android/test/mock)
@@ -284,7 +287,6 @@
# to document and check apis
files_to_check_apis := \
$(call find-other-java-files, \
- test-base/src \
$(non_base_dirs) \
)
@@ -308,6 +310,7 @@
files_to_document := \
$(files_to_check_apis) \
$(call find-other-java-files,\
+ test-base/src \
test-runner/src)
# These are relative to frameworks/base
@@ -327,6 +330,7 @@
# These are relative to frameworks/base
framework_docs_LOCAL_API_CHECK_SRC_FILES := \
+ $(framework_base_android_test_base_src_files) \
$(framework_base_android_test_mock_src_files) \
$(framework_base_android_test_runner_src_files) \
$(files_to_check_apis) \