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

Change-Id: I25af68ceb99b50d4d98a99a5af6143ddafcf5b58
This commit is contained in:
Automerger Merge Worker
2020-03-11 20:31:46 +00:00

View File

@@ -2400,8 +2400,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func whitelistedApexAvailable(apex, moduleName string) bool {
key := apex
key = strings.Replace(key, "test_", "", 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
moduleName = strings.TrimPrefix(moduleName, "prebuilt_")