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

Merge "Remove special handling of test_ apexes" am: f53737fadc

Browse Source 
Change-Id: I7ad41c7fb7408fd484efbe930689437c6900cd08
This commit is contained in:
Automerger Merge Worker
2020-03-11 20:25:08 +00:00
parent 25f0c8f21f f53737fadc
commit 784e2e472b
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -2395,8 +2395,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)
// 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
moduleName = strings.TrimPrefix(moduleName, "prebuilt_") moduleName = strings.TrimPrefix(moduleName, "prebuilt_")