Disable OMX for 64b_only devices.

bug: 239224744
Change-Id: I14364de9ef7fa3fcd6ce035eb596ac507be3e641
Merged-In: I14364de9ef7fa3fcd6ce035eb596ac507be3e641
Bug: 296185206
(cherry picked from commit 238412fe7e115681b9381786cc90802845ed4b6b)
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 5004b85..fbc6ccc 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -42,7 +42,6 @@
 # Base modules and settings for the vendor partition.
 PRODUCT_PACKAGES += \
     [email protected] \
-    [email protected] \
     boringssl_self_test_vendor \
     dumpsys_vendor \
     fs_config_files_nonsystem \
@@ -69,6 +68,13 @@
     selinux_policy_nonsystem \
     shell_and_utilities_vendor \
 
+# OMX not supported for 64bit_only builds
+ifneq ($(TARGET_SUPPORTS_OMX_SERVICE),false)
+    PRODUCT_PACKAGES += \
+        [email protected] \
+
+endif
+
 # Base module when shipping api level is less than or equal to 29
 PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 += \
     [email protected] \
diff --git a/target/product/core_64_bit_only.mk b/target/product/core_64_bit_only.mk
index 061728f..fc2b8e5 100644
--- a/target/product/core_64_bit_only.mk
+++ b/target/product/core_64_bit_only.mk
@@ -31,3 +31,4 @@
 
 TARGET_SUPPORTS_32_BIT_APPS := false
 TARGET_SUPPORTS_64_BIT_APPS := true
+TARGET_SUPPORTS_OMX_SERVICE := false