Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary filtering of android.test.mock files

Browse Source 
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
This commit is contained in:
Paul Duffin
2017-12-12 16:13:28 +00:00
parent d25de15983
commit e25cedd64d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@@ -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) \