diff options
author | Yi-Yo Chiang <yochiang@google.com> | 2023-08-17 11:48:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-08-17 11:48:28 +0000 |
commit | a98264205b20c4e22d4bad06aaa91b89195ef4cb (patch) | |
tree | 8ca701462b82bc01ce9f446657b1409c69aec56c | |
parent | f66221ce338a4fb9f6426f10a5236ccaacf3bf72 (diff) | |
parent | 53e78e080d66eaea6d49892d80d93ee25802a120 (diff) | |
download | build-android11-gsi.tar.gz |
Merge "Use dex2oat64 on 64-bit-only builds" into android11-gsiandroid11-gsi
-rw-r--r-- | target/product/core_64_bit_only.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target/product/core_64_bit_only.mk b/target/product/core_64_bit_only.mk index 91c24eb3dd..64a8967c10 100644 --- a/target/product/core_64_bit_only.mk +++ b/target/product/core_64_bit_only.mk @@ -25,6 +25,9 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64.rc:system/etc/init/hw/in # Set the zygote property to select the 64-bit script. # This line must be parsed before the one in core_minimal.mk PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64 +# A 64-bit-only platform does not have dex2oat32, so make sure dex2oat64 is +# used for dexopt. +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += dalvik.vm.dex2oat64.enabled=true TARGET_SUPPORTS_32_BIT_APPS := false TARGET_SUPPORTS_64_BIT_APPS := true |