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

Change-Id: I77aa5c70ecb39f9c18306fc0ab22ec9097ca450b
2020-01-13 03:31:28 +00:00
parent 918864fa22 47d80cdf79
commit 77c734043a
1 changed files with 5 additions and 0 deletions
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -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