Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c007b0b authored Oct 17, 2022 by Devin Moore Committed by Automerger Merge Worker Oct 17, 2022

Merge "Don't install omx service by default on new devices" am: cd91bec2

Original change: https://android-review.googlesource.com/c/platform/build/+/2254788

Change-Id: I17a75fd2885e0a3402d03576350ccab92393e928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents fa9ec4cd cd91bec2

core/product_config.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -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,

target/product/base_vendor.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -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