commit c01a5cd705e8623cfb75b5ccd5561ed6786485d1
author Colin Cross <ccross@android.com> Thu Dec 02 05:28:36 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 02 05:28:36 2021 +0000
tree 0c12558d34003be99823837922009a0f4ebfdef9
parent 3d221b302a1c37e8be3ea377ecb78494f4cd2ec9
parent 38310bb4ac9caf350b3fd79b069295c54b354c62

Merge "Only get dexpreopt config for device modules"

java/dexpreopt.go

diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index 7c081b6..f3a53ee 100644
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -122,13 +122,7 @@
 }
 
 func (d *dexpreopter) dexpreoptDisabled(ctx android.BaseModuleContext) bool {
-	global := dexpreopt.GetGlobalConfig(ctx)
-
-	if global.DisablePreopt {
-		return true
-	}
-
-	if inList(moduleName(ctx), global.DisablePreoptModules) {
+	if !ctx.Device() {
 		return true
 	}
 
@@ -144,7 +138,17 @@
 		return true
 	}
 
-	if ctx.Host() {
+	if !android.IsModulePreferred(ctx.Module()) {
+		return true
+	}
+
+	global := dexpreopt.GetGlobalConfig(ctx)
+
+	if global.DisablePreopt {
+		return true
+	}
+
+	if inList(moduleName(ctx), global.DisablePreoptModules) {
 		return true
 	}
 
@@ -161,10 +165,6 @@
 		}
 	}
 
-	if !android.IsModulePreferred(ctx.Module()) {
-		return true
-	}
-
 	// TODO: contains no java code
 
 	return false