Merge "Don't dexpreopt APEX variant modules" am: 72d009e1ec am: 47d80cdf79 am: 77c734043a

Change-Id: I1f72a27f7f5cdd32f862dc0294e08199cf8461c7
This commit is contained in:
Automerger Merge Worker
2020-01-13 03:45:31 +00:00

View File

@@ -85,6 +85,11 @@ func (d *dexpreopter) dexpreoptDisabled(ctx android.ModuleContext) bool {
return true
}
// Don't preopt APEX variant module
if am, ok := ctx.Module().(android.ApexModule); ok && !am.IsForPlatform() {
return true
}
// TODO: contains no java code
return false