From e25cedd64d0b3b14ce851d2f5963228fcd3d3bc3 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 12 Dec 2017 16:13:28 +0000 Subject: [PATCH] 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index d7c16d14656f9..ec5fb841131ea 100644 --- a/Android.mk +++ b/Android.mk @@ -276,8 +276,8 @@ non_base_dirs := \ 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 @@ 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_runner_excluding_mock_src_files) \ + $(framework_base_android_test_runner_src_files) \ $(files_to_check_apis) \ $(common_src_files) \