Merge "Don't install omx service by default on new devices" am: cd91bec2ca
am: 0c007b0b5c
Original change: https://android-review.googlesource.com/c/platform/build/+/2254788 Change-Id: If9e6f3b8bd8b52e07ba482a55eba70782e6c740d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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,
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user