summaryrefslogtreecommitdiff
path: root/java/dexpreopt.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-09-18 21:12:18 +0000
committer Colin Cross <ccross@android.com> 2019-09-18 21:12:31 +0000
commit402be41aa8df98733a16eb8f96dd769dbe8c5d80 (patch)
treeab7a4ef7ef80c556858c92a67881f6365558b777 /java/dexpreopt.go
parentfe6330c7d2d6102a0436da2892e71e3b490ac15c (diff)
Revert "Remove old-style support for translated second architectures"
This reverts commit fe6330c7d2d6102a0436da2892e71e3b490ac15c. Reason for revert: this was accidentally propping up NDK builds Bug: 141242600 Change-Id: Ie9f8e31479a74e8e9e14d720a5936da6b1d5d113
Diffstat (limited to 'java/dexpreopt.go')
-rw-r--r--java/dexpreopt.go4
1 files changed, 4 insertions, 0 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