commit e25cedd64d0b3b14ce851d2f5963228fcd3d3bc3
author Paul Duffin <paulduffin@google.com> Tue Dec 12 16:13:28 2017 +0000
committer Paul Duffin <paulduffin@google.com> Wed Dec 13 07:37:49 2017 +0000
tree 865f6b2eaa28721f16801827e645ae5da767d152
parent d25de15983cb50d07d3a50aafb8e714af369b8bd

Remove unnecessary filtering of android.test.mock files

Previously the android.test.mock files were in the test-runner/src
directory so had to be filtered out of the android.test.runner source
files but the android.test.mock files are now in their own test-mock/src
directory so the filtering is no longer required.

Bug: 30188076
Test: make checkbuild
Change-Id: I1f28fc0735e16fa166663e5797af641b08a4926c

Android.mk

diff --git a/Android.mk b/Android.mk
index d7c16d1..ec5fb84 100644
--- a/Android.mk
+++ b/Android.mk
@@ -276,8 +276,8 @@
 framework_base_android_test_mock_src_files := \
   $(call all-java-files-under, test-mock/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))
+framework_base_android_test_runner_src_files := \
+  $(call all-java-files-under, test-runner/src)
 
 # Find all files in specific directories (relative to frameworks/base)
 # to document and check apis
@@ -327,7 +327,7 @@
 # These are relative to frameworks/base
 framework_docs_LOCAL_API_CHECK_SRC_FILES := \
   $(framework_base_android_test_mock_src_files) \
-  $(framework_base_android_test_runner_excluding_mock_src_files) \
+  $(framework_base_android_test_runner_src_files) \
   $(files_to_check_apis) \
   $(common_src_files) \