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
Test: m nothing
Change-Id: Ibad76fb73988688eb303e056197986ee9a6119ae
Merged-In: Ibad76fb73988688eb303e056197986ee9a6119ae
diff --git a/apex/apex.go b/apex/apex.go
index ac72183..2f8384f 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -115,7 +115,7 @@
//
// Module separator
//
- m["com.android.art"] = []string{
+ artApexContents := []string{
"art_cmdlineparser_headers",
"art_disassembler_headers",
"art_libartbase_headers",
@@ -190,6 +190,8 @@
"libziparchive",
"perfetto_trace_protos",
}
+ m["com.android.art.debug"] = artApexContents
+ m["com.android.art.release"] = artApexContents
//
// Module separator
//
@@ -2393,8 +2395,6 @@
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