Move android.test classes from core/java to legacy-test/src

(cherry picked from 2395179afb2ea957a9ba66404021c14160361611)

Bug: 30188076
Test: make checkbuild
Merged-In: Ifa291909fcf47da788627b496bd72f54efd78ed7
Change-Id: Ie20dceb9f89df245ed6da5fc2fb06185bd7b104b

15 files changed, 6 insertions, 4 deletions

diff --git a/Android.mk b/Android.mk
index c0bb7240c796..4285a97f5849 100644
--- a/Android.mk
+++ b/Android.mk
@@ -502,7 +502,7 @@ framework_res_R_stamp := \
 LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)
 
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp legacy-test bouncycastle ext
+LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext
 LOCAL_STATIC_JAVA_LIBRARIES := framework-protos
 
 LOCAL_MODULE := framework
@@ -729,6 +729,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 := \
+	legacy-test/src \
 	test-runner/src \
 	$(patsubst $(LOCAL_PATH)/%,%, \
 	  $(wildcard \
diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk
index 00110021584c..7bab1894373d 100644
--- a/legacy-test/Android.mk
+++ b/legacy-test/Android.mk
@@ -21,11 +21,12 @@ LOCAL_PATH:= $(call my-dir)
 # This contains the junit.framework classes that were in Android API level 25.
 include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_MODULE := legacy-test
 LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj core-libart framework
 LOCAL_STATIC_JAVA_LIBRARIES := core-junit-static
 
-LOCAL_MODULE := legacy-test
-
 include $(BUILD_JAVA_LIBRARY)
 
 ifeq ($(HOST_OS),linux)
@@ -34,7 +35,7 @@ ifeq ($(HOST_OS),linux)
 # This contains the android.test.PerformanceTestCase class only
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := ../core/java/android/test/PerformanceTestCase.java
+LOCAL_SRC_FILES := src/android/test/PerformanceTestCase.java
 LOCAL_MODULE := legacy-performance-test-hostdex
 
 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
diff --git a/core/java/android/test/AndroidTestCase.java b/legacy-test/src/android/test/AndroidTestCase.java
index 1e6bd9c14fd9..1e6bd9c14fd9 100644
--- a/core/java/android/test/AndroidTestCase.java
+++ b/legacy-test/src/android/test/AndroidTestCase.java
diff --git a/core/java/android/test/FlakyTest.java b/legacy-test/src/android/test/FlakyTest.java
index 4e5c4e35a8c6..4e5c4e35a8c6 100644
--- a/core/java/android/test/FlakyTest.java
+++ b/legacy-test/src/android/test/FlakyTest.java
diff --git a/core/java/android/test/InstrumentationTestCase.java b/legacy-test/src/android/test/InstrumentationTestCase.java
index 6b79314a4385..6b79314a4385 100644
--- a/core/java/android/test/InstrumentationTestCase.java
+++ b/legacy-test/src/android/test/InstrumentationTestCase.java
diff --git a/core/java/android/test/InstrumentationTestSuite.java b/legacy-test/src/android/test/InstrumentationTestSuite.java
index a53fa267f1e1..a53fa267f1e1 100644
--- a/core/java/android/test/InstrumentationTestSuite.java
+++ b/legacy-test/src/android/test/InstrumentationTestSuite.java
diff --git a/core/java/android/test/PerformanceTestCase.java b/legacy-test/src/android/test/PerformanceTestCase.java
index 65bd4a48f7f5..65bd4a48f7f5 100644
--- a/core/java/android/test/PerformanceTestCase.java
+++ b/legacy-test/src/android/test/PerformanceTestCase.java
diff --git a/core/java/android/test/RepetitiveTest.java b/legacy-test/src/android/test/RepetitiveTest.java
index 6a7130e68e61..6a7130e68e61 100644
--- a/core/java/android/test/RepetitiveTest.java
+++ b/legacy-test/src/android/test/RepetitiveTest.java
diff --git a/core/java/android/test/UiThreadTest.java b/legacy-test/src/android/test/UiThreadTest.java
index cd06ab890074..cd06ab890074 100644
--- a/core/java/android/test/UiThreadTest.java
+++ b/legacy-test/src/android/test/UiThreadTest.java
diff --git a/core/java/android/test/package.html b/legacy-test/src/android/test/package.html
index 5be51359630e..5be51359630e 100644
--- a/core/java/android/test/package.html
+++ b/legacy-test/src/android/test/package.html
diff --git a/core/java/android/test/suitebuilder/annotation/LargeTest.java b/legacy-test/src/android/test/suitebuilder/annotation/LargeTest.java
index dc77ee6b2739..dc77ee6b2739 100644
--- a/core/java/android/test/suitebuilder/annotation/LargeTest.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/LargeTest.java
diff --git a/core/java/android/test/suitebuilder/annotation/MediumTest.java b/legacy-test/src/android/test/suitebuilder/annotation/MediumTest.java
index b941da03ac9a..b941da03ac9a 100644
--- a/core/java/android/test/suitebuilder/annotation/MediumTest.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/MediumTest.java
diff --git a/core/java/android/test/suitebuilder/annotation/SmallTest.java b/legacy-test/src/android/test/suitebuilder/annotation/SmallTest.java
index d3c74f019b53..d3c74f019b53 100644
--- a/core/java/android/test/suitebuilder/annotation/SmallTest.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/SmallTest.java
diff --git a/core/java/android/test/suitebuilder/annotation/Smoke.java b/legacy-test/src/android/test/suitebuilder/annotation/Smoke.java
index aac293796be1..aac293796be1 100644
--- a/core/java/android/test/suitebuilder/annotation/Smoke.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/Smoke.java
diff --git a/core/java/android/test/suitebuilder/annotation/Suppress.java b/legacy-test/src/android/test/suitebuilder/annotation/Suppress.java
index 629a3cf4a2cd..629a3cf4a2cd 100644
--- a/core/java/android/test/suitebuilder/annotation/Suppress.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/Suppress.java