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 am: 784e2e472b am: 8aa853c134

Browse Source 
Change-Id: Ieb79738fb27a51d5c8e379ed7fd71eff53aa2d9c
This commit is contained in:
Automerger Merge Worker
2020-03-11 20:33:23 +00:00
parent 57c68c3d28 8aa853c134
commit 9aec4c5a38
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

@@ -2400,8 +2400,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_")