From 238412fe7e115681b9381786cc90802845ed4b6b Mon Sep 17 00:00:00 2001 From: Arun Johnson Date: Wed, 3 Aug 2022 19:19:59 +0000 Subject: Disable OMX for 64b_only devices. bug: 239224744 Change-Id: I14364de9ef7fa3fcd6ce035eb596ac507be3e641 Merged-In: I14364de9ef7fa3fcd6ce035eb596ac507be3e641 Bug: 296185206 (cherry picked from commit a6226a8e3b52501337ac6cebda49dc07f3d66576) --- target/product/base_vendor.mk | 8 +++++++- target/product/core_64_bit_only.mk | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 07b33617dd..b98375de6e 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -41,7 +41,6 @@ PRODUCT_HOST_PACKAGES += \ # Base modules and settings for the vendor partition. PRODUCT_PACKAGES += \ android.hardware.cas@1.2-service \ - android.hardware.media.omx@1.0-service \ boringssl_self_test_vendor \ dumpsys_vendor \ fs_config_files_nonsystem \ @@ -68,6 +67,13 @@ PRODUCT_PACKAGES += \ selinux_policy_nonsystem \ shell_and_utilities_vendor \ +# OMX not supported for 64bit_only builds +ifneq ($(TARGET_SUPPORTS_OMX_SERVICE),false) + PRODUCT_PACKAGES += \ + android.hardware.media.omx@1.0-service \ + +endif + # Base module when shipping api level is less than or equal to 29 PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 += \ android.hardware.configstore@1.1-service \ diff --git a/target/product/core_64_bit_only.mk b/target/product/core_64_bit_only.mk index 53c9c74eb5..8a2d23ac99 100644 --- a/target/product/core_64_bit_only.mk +++ b/target/product/core_64_bit_only.mk @@ -28,3 +28,4 @@ PRODUCT_VENDOR_PROPERTIES += ro.zygote=zygote64 TARGET_SUPPORTS_32_BIT_APPS := false TARGET_SUPPORTS_64_BIT_APPS := true +TARGET_SUPPORTS_OMX_SERVICE := false -- cgit v1.2.3 From 3342028200bcb2ed3545a5107d1dbf588fa3f31e Mon Sep 17 00:00:00 2001 From: Kevin Brodsky Date: Fri, 26 Nov 2021 15:40:08 +0000 Subject: Use dex2oat64 on 64-bit-only builds dexopt defaults to dex2oat32 unless instructed otherwise. Since dex2oat32 doesn't exist on a 64-bit-only build, make sure dex2oat64 is selected instead. Test: boot aosp_cf_x86_64_only_phone and check that installd doesn't try to use dex2oat32 Change-Id: Ia67e746894684a52a4e5b765bfde0f6dd0efbf6e Merged-In: Ia67e746894684a52a4e5b765bfde0f6dd0efbf6e Bug: 296185206 (cherry picked from commit 53e78e080d66eaea6d49892d80d93ee25802a120) --- target/product/core_64_bit_only.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/product/core_64_bit_only.mk b/target/product/core_64_bit_only.mk index 8a2d23ac99..fc2b8e5498 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_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 -- cgit v1.2.3