From cce7b33289a6ee7668973635fc9315b76ef19900 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Tue, 26 Feb 2019 12:00:38 +0000 Subject: [PATCH] Use new libcore filegroup variable This change switches frameworks/base/ targets to a generic "interface" libcore filegroup variable, core_public_api_files, rather than having it know about Core Library internal filegroups. It is not perfect because the command line tools need to know to exclude certain packages, but it is a step in the right direction. Bug: 126332291 Test: build only Merged-In: I72667f30dc5685fdc24aca3f8ee82b20c7548449 Change-Id: I72667f30dc5685fdc24aca3f8ee82b20c7548449 --- Android.bp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Android.bp b/Android.bp index 5935bfb572133..7513b07461330 100644 --- a/Android.bp +++ b/Android.bp @@ -1179,10 +1179,7 @@ stubs_defaults { "test-base/src/**/*.java", ":opt-telephony-srcs", ":opt-net-voip-srcs", - ":openjdk_javadoc_files", - ":non_openjdk_javadoc_files", - ":android_icu4j_src_files_for_docs", - ":conscrypt_public_api_files", + ":core_public_api_files", "test-mock/src/**/*.java", "test-runner/src/**/*.java", ], @@ -1240,10 +1237,7 @@ stubs_defaults { srcs: [ ":opt-telephony-srcs", ":opt-net-voip-srcs", - ":openjdk_javadoc_files", - ":non_openjdk_javadoc_files", - ":android_icu4j_src_files_for_docs", - ":conscrypt_public_api_files", + ":core_public_api_files", ], srcs_lib: "framework", srcs_lib_whitelist_dirs: frameworks_base_subdirs,