From a835eb9810c260dbee73c8fd0643372573f5d182 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Fri, 14 Oct 2022 15:20:20 +0000 Subject: [PATCH] Don't install omx service by default on new devices On devices launching after Android U, we no longer install the HIDL OMX service. It is deprecated. Test: Build and run Cuttlefish with SHIPING_API_LEVEL 33 and 34 Bug: 218588089 Change-Id: I9a6dbffd381bdad5428e9c365bd50445a9b14a67 --- core/product_config.mk | 3 +++ target/product/base_vendor.mk | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/product_config.mk b/core/product_config.mk index 198dde418b..e03ae2baee 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -473,6 +473,9 @@ ifdef PRODUCT_SHIPPING_API_LEVEL ifneq (,$(call math_gt_or_eq,29,$(PRODUCT_SHIPPING_API_LEVEL))) PRODUCT_PACKAGES += $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29) endif + ifneq (,$(call math_gt_or_eq,33,$(PRODUCT_SHIPPING_API_LEVEL))) + PRODUCT_PACKAGES += $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33) + endif endif # If build command defines OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS, diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 8d257bf3bb..7fb785ca4d 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -74,8 +74,9 @@ PRODUCT_PACKAGES += \ shell_and_utilities_vendor \ # OMX not supported for 64bit_only builds +# Only supported when SHIPPING_API_LEVEL is less than or equal to 33 ifneq ($(TARGET_SUPPORTS_OMX_SERVICE),false) - PRODUCT_PACKAGES += \ + PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33 += \ android.hardware.media.omx@1.0-service \ endif