From c23d9f652b450efc9e603d6a9ff9ddec3efb1f4c Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 10 Mar 2020 13:44:19 +0000 Subject: Remove special handling of com.android.art.debug/release The whitelistedApexAvailable used to map references to com.android.art.debug/release to com.android.art before looking it up in the white list. This change removed that mapping and simply added both to the white list. Bug: 142935992 Bug: 153306490 Test: m nothing Merged-In: Ibad76fb73988688eb303e056197986ee9a6119ae Change-Id: Ibad76fb73988688eb303e056197986ee9a6119ae --- apex/apex.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apex/apex.go') diff --git a/apex/apex.go b/apex/apex.go index f3940681..894439fd 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -91,7 +91,7 @@ func makeApexAvailableWhitelist() map[string][]string { // // Module separator // - m["com.android.art"] = []string{ + artApexContents := []string{ "art_cmdlineparser_headers", "art_disassembler_headers", "art_libartbase_headers", @@ -152,6 +152,8 @@ func makeApexAvailableWhitelist() map[string][]string { "libziparchive", "perfetto_trace_protos", } + m["com.android.art.debug"] = artApexContents + m["com.android.art.release"] = artApexContents // // Module separator // @@ -2183,8 +2185,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { func whitelistedApexAvailable(apex, moduleName string) bool { key := apex key = strings.Replace(key, "test_", "", 1) - key = strings.Replace(key, "com.android.art.debug", "com.android.art", 1) - key = strings.Replace(key, "com.android.art.release", "com.android.art", 1) // Prebuilt modules (e.g. java_import, etc.) have "prebuilt_" prefix added by the build // system. Trim the prefix for the check since they are confusing -- cgit v1.2.3