StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove special handling of com.android.art.debug/release" am: de77904484

Browse Source 
Change-Id: I638079582a7a0995cc63ad6623890d5cacdc6f6b
This commit is contained in:
Automerger Merge Worker
2020-03-11 20:13:53 +00:00
parent 6f3c4be8a7 de77904484
commit 0277cec3bd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/apex.go
View File

@@ -115,7 +115,7 @@ func makeApexAvailableWhitelist() map[string][]string {
// //
// Module separator // Module separator
// //
m["com.android.art"] = []string{ artApexContents := []string{
"art_cmdlineparser_headers", "art_cmdlineparser_headers",
"art_disassembler_headers", "art_disassembler_headers",
"art_libartbase_headers", "art_libartbase_headers",
@@ -190,6 +190,8 @@ func makeApexAvailableWhitelist() map[string][]string {
"libziparchive", "libziparchive",
"perfetto_trace_protos", "perfetto_trace_protos",
} }
m["com.android.art.debug"] = artApexContents
m["com.android.art.release"] = artApexContents
// //
// Module separator // Module separator
// //
@@ -2394,8 +2396,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func whitelistedApexAvailable(apex, moduleName string) bool { func whitelistedApexAvailable(apex, moduleName string) bool {
key := apex key := apex
key = strings.Replace(key, "test_", "", 1) 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 // 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 // system. Trim the prefix for the check since they are confusing