diff options
| author | Yi-Yo Chiang <yochiang@google.com> | 2023-08-17 08:13:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-08-17 08:13:20 +0000 |
| commit | f66221ce338a4fb9f6426f10a5236ccaacf3bf72 (patch) | |
| tree | 8de1cf16511e75715ab338565349895f03cd690c | |
| parent | 6b7eaf70f7c1a2b9e430736c168dcdca6ee40f0c (diff) | |
| parent | a6226a8e3b52501337ac6cebda49dc07f3d66576 (diff) | |
| download | build-f66221ce338a4fb9f6426f10a5236ccaacf3bf72.tar.gz | |
Merge "Disable OMX for 64b_only devices." into android11-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 471340b2d1..f3b191d60c 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 += \ shell_and_utilities_vendor \ vndservice \ +# 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 8901a50434..91c24eb3dd 100644 --- a/target/product/core_64_bit_only.mk +++ b/target/product/core_64_bit_only.mk @@ -28,3 +28,4 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64 TARGET_SUPPORTS_32_BIT_APPS := false TARGET_SUPPORTS_64_BIT_APPS := true +TARGET_SUPPORTS_OMX_SERVICE := false |