Move legacy-test to test-base

Make it consistent with the test-mock and test-runner directories.
Also renames the files in api/ subdirectory.

(cherry picked from commit f779efd62c)

Bug: 30188076
Test: make checkbuild
Change-Id: Ied3621e6201d8717223fe1ccd4ea77d458126b25
Merged-In: If4f99a65fcca416ede5b3e63481398f0b451bcb7
This commit is contained in:
Paul Duffin
2017-11-16 15:47:05 +00:00
parent f0561142f3
commit 2141827700
38 changed files with 6 additions and 6 deletions

View File

@@ -82,7 +82,7 @@ framework_base_android_test_runner_excluding_mock_src_files := \
# to document and check apis # to document and check apis
files_to_check_apis := \ files_to_check_apis := \
$(call find-other-java-files, \ $(call find-other-java-files, \
legacy-test/src \ test-base/src \
$(non_base_dirs) \ $(non_base_dirs) \
) )

View File

@@ -34,8 +34,8 @@ LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src
LEGACY_TEST_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/legacy.test.stubs_intermediates/api.txt LEGACY_TEST_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/legacy.test.stubs_intermediates/api.txt
LEGACY_TEST_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/legacy.test.stubs_intermediates/removed.txt LEGACY_TEST_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/legacy.test.stubs_intermediates/removed.txt
LEGACY_TEST_API_FILE := $(LOCAL_PATH)/api/legacy-test-current.txt LEGACY_TEST_API_FILE := $(LOCAL_PATH)/api/android-test-base-current.txt
LEGACY_TEST_REMOVED_API_FILE := $(LOCAL_PATH)/api/legacy-test-removed.txt LEGACY_TEST_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-base-removed.txt
LOCAL_DROIDDOC_OPTIONS:= \ LOCAL_DROIDDOC_OPTIONS:= \
-stubpackages android.test:android.test.suitebuilder.annotation:com.android.internal.util:junit.framework \ -stubpackages android.test:android.test.suitebuilder.annotation:com.android.internal.util:junit.framework \
@@ -88,7 +88,7 @@ $(eval $(call check-api, \
-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
-error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \ -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \
-error 25 -error 26 -error 27, \ -error 25 -error 26 -error 27, \
cat $(LOCAL_PATH)/api/apicheck_msg_legacy_test.txt, \ cat $(LOCAL_PATH)/api/apicheck_msg_android_test_base.txt, \
check-legacy-test-api, \ check-legacy-test-api, \
$(call doc-timestamp-for,legacy-test-api-stubs-gen) \ $(call doc-timestamp-for,legacy-test-api-stubs-gen) \
)) ))

View File

@@ -1 +1 @@
../legacy-test/jarjar-rules.txt ../test-base/jarjar-rules.txt

View File

@@ -1 +1 @@
../legacy-test/jarjar-rules.txt ../test-base/jarjar-rules.txt