From df2576045e0edbed05bf4511e0e9ba1038b8f3bb Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 30 Nov 2016 13:29:39 +0000 Subject: [PATCH] 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 --- Android.mk | 3 ++- legacy-test/Android.mk | 9 +++++---- .../src}/android/test/AndroidTestCase.java | 0 .../java => legacy-test/src}/android/test/FlakyTest.java | 0 .../src}/android/test/InstrumentationTestCase.java | 0 .../src}/android/test/InstrumentationTestSuite.java | 0 .../src}/android/test/PerformanceTestCase.java | 0 .../src}/android/test/RepetitiveTest.java | 0 .../src}/android/test/UiThreadTest.java | 0 {core/java => legacy-test/src}/android/test/package.html | 0 .../android/test/suitebuilder/annotation/LargeTest.java | 0 .../android/test/suitebuilder/annotation/MediumTest.java | 0 .../android/test/suitebuilder/annotation/SmallTest.java | 0 .../src}/android/test/suitebuilder/annotation/Smoke.java | 0 .../android/test/suitebuilder/annotation/Suppress.java | 0 15 files changed, 7 insertions(+), 5 deletions(-) rename {core/java => legacy-test/src}/android/test/AndroidTestCase.java (100%) rename {core/java => legacy-test/src}/android/test/FlakyTest.java (100%) rename {core/java => legacy-test/src}/android/test/InstrumentationTestCase.java (100%) rename {core/java => legacy-test/src}/android/test/InstrumentationTestSuite.java (100%) rename {core/java => legacy-test/src}/android/test/PerformanceTestCase.java (100%) rename {core/java => legacy-test/src}/android/test/RepetitiveTest.java (100%) rename {core/java => legacy-test/src}/android/test/UiThreadTest.java (100%) rename {core/java => legacy-test/src}/android/test/package.html (100%) rename {core/java => legacy-test/src}/android/test/suitebuilder/annotation/LargeTest.java (100%) rename {core/java => legacy-test/src}/android/test/suitebuilder/annotation/MediumTest.java (100%) rename {core/java => legacy-test/src}/android/test/suitebuilder/annotation/SmallTest.java (100%) rename {core/java => legacy-test/src}/android/test/suitebuilder/annotation/Smoke.java (100%) rename {core/java => legacy-test/src}/android/test/suitebuilder/annotation/Suppress.java (100%) diff --git a/Android.mk b/Android.mk index c0bb7240c796b..4285a97f58491 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 00110021584c6..7bab1894373d0 100644 --- a/legacy-test/Android.mk +++ b/legacy-test/Android.mk @@ -21,10 +21,11 @@ LOCAL_PATH:= $(call my-dir) # This contains the junit.framework classes that were in Android API level 25. include $(CLEAR_VARS) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_STATIC_JAVA_LIBRARIES := core-junit-static - +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 include $(BUILD_JAVA_LIBRARY) @@ -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 similarity index 100% rename from core/java/android/test/AndroidTestCase.java rename to legacy-test/src/android/test/AndroidTestCase.java diff --git a/core/java/android/test/FlakyTest.java b/legacy-test/src/android/test/FlakyTest.java similarity index 100% rename from core/java/android/test/FlakyTest.java rename to legacy-test/src/android/test/FlakyTest.java diff --git a/core/java/android/test/InstrumentationTestCase.java b/legacy-test/src/android/test/InstrumentationTestCase.java similarity index 100% rename from core/java/android/test/InstrumentationTestCase.java rename to legacy-test/src/android/test/InstrumentationTestCase.java diff --git a/core/java/android/test/InstrumentationTestSuite.java b/legacy-test/src/android/test/InstrumentationTestSuite.java similarity index 100% rename from core/java/android/test/InstrumentationTestSuite.java rename to legacy-test/src/android/test/InstrumentationTestSuite.java diff --git a/core/java/android/test/PerformanceTestCase.java b/legacy-test/src/android/test/PerformanceTestCase.java similarity index 100% rename from core/java/android/test/PerformanceTestCase.java rename to legacy-test/src/android/test/PerformanceTestCase.java diff --git a/core/java/android/test/RepetitiveTest.java b/legacy-test/src/android/test/RepetitiveTest.java similarity index 100% rename from core/java/android/test/RepetitiveTest.java rename to legacy-test/src/android/test/RepetitiveTest.java diff --git a/core/java/android/test/UiThreadTest.java b/legacy-test/src/android/test/UiThreadTest.java similarity index 100% rename from core/java/android/test/UiThreadTest.java rename to legacy-test/src/android/test/UiThreadTest.java diff --git a/core/java/android/test/package.html b/legacy-test/src/android/test/package.html similarity index 100% rename from core/java/android/test/package.html rename to 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 similarity index 100% rename from core/java/android/test/suitebuilder/annotation/LargeTest.java rename to 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 similarity index 100% rename from core/java/android/test/suitebuilder/annotation/MediumTest.java rename to 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 similarity index 100% rename from core/java/android/test/suitebuilder/annotation/SmallTest.java rename to 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 similarity index 100% rename from core/java/android/test/suitebuilder/annotation/Smoke.java rename to 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 similarity index 100% rename from core/java/android/test/suitebuilder/annotation/Suppress.java rename to legacy-test/src/android/test/suitebuilder/annotation/Suppress.java