diff options
| author | Devin Moore <devinmoore@google.com> | 2022-10-17 15:21:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-10-17 15:21:31 +0000 |
| commit | cd91bec2ca8835199f408d20f69c222693100544 (patch) | |
| tree | d3e0020c5c860be1ad1f16802e5c3720b0140d86 | |
| parent | 09d7031f7db379ab80e048a541624b9bd2916d9c (diff) | |
| parent | a835eb9810c260dbee73c8fd0643372573f5d182 (diff) | |
| download | build-cd91bec2ca8835199f408d20f69c222693100544.tar.gz | |
Merge "Don't install omx service by default on new devices"
| -rw-r--r-- | core/product_config.mk | 3 | ||||
| -rw-r--r-- | target/product/base_vendor.mk | 3 |
2 files changed, 5 insertions, 1 deletions
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 |