diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-08-18 10:29:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-08-18 10:29:14 +0000 |
| commit | c5d430a2710caa7fa5697c4238044a24e1268f92 (patch) | |
| tree | 7006e5337053a53edafc17c6dbcdd2c04d307532 | |
| parent | 28c259771d13181235e64d5cfc7ad2e5b02d91e8 (diff) | |
| parent | 39fe83778dd2e17f11c625a1a468045e7b3fd6d6 (diff) | |
| download | build-android13-gsi.tar.gz | |
Merge "Disable OMX for 64b_only devices." into android13-gsiandroid13-gsi
| -rw-r--r-- | target/product/base_vendor.mk | 8 | ||||
| -rw-r--r-- | target/product/core_64_bit_only.mk | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 5004b85ee1..fbc6cccefa 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -42,7 +42,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 \ @@ -69,6 +68,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 061728f291..fc2b8e5498 100644 --- a/target/product/core_64_bit_only.mk +++ b/target/product/core_64_bit_only.mk @@ -31,3 +31,4 @@ 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 |