diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 103536297838..1f373264b0db 100644 --- a/Android.mk +++ b/Android.mk @@ -274,8 +274,8 @@ 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-mock/src/android/test/mock) +framework_base_android_test_base_src_files := \ + $(call all-java-files-under, test-base/src/junit) framework_base_android_test_runner_src_files := \ $(call all-java-files-under, test-runner/src/junit) @@ -284,7 +284,6 @@ framework_base_android_test_runner_src_files := \ # to document and check apis files_to_check_apis := \ $(call find-other-java-files, \ - test-base/src \ $(non_base_dirs) \ ) @@ -308,6 +307,8 @@ files_to_check_apis_generated := \ files_to_document := \ $(files_to_check_apis) \ $(call find-other-java-files,\ + test-base/src \ + test-mock/src \ test-runner/src) # These are relative to frameworks/base @@ -327,7 +328,7 @@ framework_docs_LOCAL_SRC_FILES := \ # These are relative to frameworks/base framework_docs_LOCAL_API_CHECK_SRC_FILES := \ - $(framework_base_android_test_mock_src_files) \ + $(framework_base_android_test_base_src_files) \ $(framework_base_android_test_runner_src_files) \ $(files_to_check_apis) \ $(common_src_files) \ @@ -355,7 +356,6 @@ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ icu4j \ framework \ 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. @@ -999,7 +999,6 @@ LOCAL_PROTOC_FLAGS := \ -Iexternal/protobuf/src LOCAL_SOURCE_FILES_ALL_GENERATED := true LOCAL_SRC_FILES := \ - tools/streaming_proto/stream.proto \ cmds/am/proto/instrumentation_data.proto \ $(call all-proto-files-under, core/proto) \ $(call all-proto-files-under, libs/incident/proto) \ |