openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Paul Duffin 2020-03-10 13:44:19 +00:00
parent acdd308344
commit c23d9f652b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apex/apex.go
View File

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