diff options
| author | 2017-06-30 07:46:55 +0000 | |
|---|---|---|
| committer | 2017-06-30 07:46:55 +0000 | |
| commit | db8ef65206ec8b4377e1df0cb618cb49a0c15c31 (patch) | |
| tree | 5f75f6fdb3606b2669459971d41daedeaebf0df0 | |
| parent | 8a57888844ab38d87bc2098b93227e213400f8d4 (diff) | |
| parent | c08090f6d25675fd5f469bf14a9fed6e2231c2ea (diff) | |
Merge "Refactor in preparation for removing android.test.mock"
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 03058b9be6ea..7fda1dde463a 100644 --- a/Android.mk +++ b/Android.mk @@ -874,7 +874,6 @@ packages_to_document := \ # The result will be relative to frameworks/base. fwbase_dirs_to_document := \ legacy-test/src \ - test-runner/src \ $(patsubst $(LOCAL_PATH)/%,%, \ $(wildcard \ $(foreach dir, $(FRAMEWORKS_BASE_JAVA_SRC_DIRS), \ @@ -892,6 +891,12 @@ non_base_dirs := \ ../opt/net/voip/src/java/android/net/rtp \ ../opt/net/voip/src/java/android/net/sip +framework_base_android_test_mock_src_files := \ + $(call all-java-files-under, test-runner/src/android/test/mock) + +framework_base_android_test_runner_excluding_mock_src_files := \ + $(filter-out $(framework_base_android_test_mock_src_files), $(call all-java-files-under, test-runner/src)) + # These are relative to frameworks/base dirs_to_check_apis := \ $(fwbase_dirs_to_document) \ @@ -911,6 +916,7 @@ endef # FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk dirs_to_document := \ $(dirs_to_check_apis) \ + test-runner/src \ $(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS)) patterns_to_not_document := \ @@ -933,7 +939,9 @@ framework_docs_LOCAL_SRC_FILES := \ # These are relative to frameworks/base framework_docs_LOCAL_API_CHECK_SRC_FILES := \ - $(call find-other-java-files, $(dirs_to_check_apis)) \ + $(framework_base_android_test_mock_src_files) \ + $(framework_base_android_test_runner_excluding_mock_src_files) \ + $(call all-java-files-under, $(dirs_to_check_apis)) \ $(common_src_files) # This is used by ide.mk as the list of source files that are @@ -957,7 +965,8 @@ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ ext \ icu4j \ framework \ - voip-common + voip-common \ + android.test.mock \ # Platform docs can refer to Support Library APIs, but we don't actually build # them as part of the docs target, so we need to include them on the classpath. |