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

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

This commit is contained in:
Treehugger Robot 2020-03-11 16:46:21 +00:00 committed by Gerrit Code Review
parent 2d80d382fa 50cbefd5e8
commit de77904484
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

@ -115,7 +115,7 @@ func makeApexAvailableWhitelist() map[string][]string {
//
// Module separator
//
m["com.android.art"] = []string{
artApexContents := []string{
"art_cmdlineparser_headers",
"art_disassembler_headers",
"art_libartbase_headers",
@ -190,6 +190,8 @@ func makeApexAvailableWhitelist() map[string][]string {
"libziparchive",
"perfetto_trace_protos",
}
m["com.android.art.debug"] = artApexContents
m["com.android.art.release"] = artApexContents
//
// Module separator
//
@ -2394,8 +2396,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