diff options
| author | Yi-Yo Chiang <yochiang@google.com> | 2023-08-18 07:21:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-08-18 07:21:13 +0000 |
| commit | df7cc83c6ef26f25b64f8884fffad2c565c46d05 (patch) | |
| tree | f38742e007b28296a7627b0b7d40d476b16f7e7a | |
| parent | bd313ef69424850f2b78000fb916ca17ed98c693 (diff) | |
| parent | 3342028200bcb2ed3545a5107d1dbf588fa3f31e (diff) | |
| download | build-android12-gsi.tar.gz | |
Merge changes Ia67e7468,I14364de9 into android12-gsiandroid12-gsi
* changes:
Use dex2oat64 on 64-bit-only builds
Disable OMX for 64b_only devices.
| -rw-r--r-- | target/product/base_vendor.mk | 8 | ||||
| -rw-r--r-- | target/product/core_64_bit_only.mk | 4 |
2 files changed, 11 insertions, 1 deletions
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..fc2b8e5498 100644 --- a/target/product/core_64_bit_only.mk +++ b/target/product/core_64_bit_only.mk @@ -25,6 +25,10 @@ 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 +TARGET_SUPPORTS_OMX_SERVICE := false |