Merge "Revert "Remove old-style support for translated second architectures""

2 files changed, 9 insertions, 1 deletions

diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index 8bc9b19ad..6214dac44 100644
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -126,6 +126,10 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
 			archs = archs[:1]
 		}
 	}
+	if ctx.Config().SecondArchIsTranslated() {
+		// Only preopt primary arch for translated arch since there is only an image there.
+		archs = archs[:1]
+	}
 
 	var images android.Paths
 	var imagesDeps []android.Paths
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 043f9daed..8c699b83a 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -87,7 +87,11 @@ var systemServerClasspathKey = android.NewOnceKey("systemServerClasspath")
 // supported through native bridge.
 func dexpreoptTargets(ctx android.PathContext) []android.Target {
 	var targets []android.Target
-	for _, target := range ctx.Config().Targets[android.Android] {
+	for i, target := range ctx.Config().Targets[android.Android] {
+		if ctx.Config().SecondArchIsTranslated() && i > 0 {
+			break
+		}
+
 		if target.NativeBridge == android.NativeBridgeDisabled {
 			targets = append(targets, target)
 		}