commit d373dd29385364dae161943f53ea4262cdeb51ce
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 30 09:48:09 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 30 09:48:09 2021 +0000
tree e81e2e0cc8654a8fd649257bfa03dc74c541f110
parent 9bc6186a78a5c338b5c59b38777de3c083166fae
parent 1917e4e047641c8166b77e898568429a773ec364

Merge "Use dex2oat64 on 64-bit-only builds"

target/product/core_64_bit_only.mk

diff --git a/target/product/core_64_bit_only.mk b/target/product/core_64_bit_only.mk
index 53c9c74..061728f 100644
--- a/target/product/core_64_bit_only.mk
+++ b/target/product/core_64_bit_only.mk
@@ -25,6 +25,9 @@
 # Set the zygote property to select the 64-bit script.
 # This line must be parsed before the one in core_minimal.mk
 PRODUCT_VENDOR_PROPERTIES += ro.zygote=zygote64
+# A 64-bit-only platform does not have dex2oat32, so make sure dex2oat64 is
+# used for dexopt.
+PRODUCT_VENDOR_PROPERTIES += dalvik.vm.dex2oat64.enabled=true
 
 TARGET_SUPPORTS_32_BIT_APPS := false
 TARGET_SUPPORTS_64_BIT_APPS := true