commit 92ff5fd93c03ac5b3e986e7bfca9ae29b322c1a2
author Alistair Delva <adelva@google.com> Thu May 07 10:05:37 2020 -0700
committer Alistair Delva <adelva@google.com> Mon May 11 12:37:39 2020 -0700
tree becbd9f2a1878598b0227a7cb5acac840708973f
parent bfa25eef3090ea5963aa23b12ac4ac8e6ddb1629

Consolidate DRM common properties

Bug: 155995740
Change-Id: I0af6d503e7d7366cd0b346b6e9b5c7a48995e507

shared/auto/device.mk

diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index d825b00..9f6f9d1 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -72,9 +72,6 @@
 endif
 PRODUCT_PACKAGES += $(LOCAL_AUDIOCONTROL_HAL_PRODUCT_PACKAGE)
 
-# DRM HAL
-PRODUCT_PACKAGES += android.hardware.drm@1.3-service.clearkey
-
 # CAN bus HAL
 PRODUCT_PACKAGES += android.hardware.automotive.can@1.0-service
 PRODUCT_PACKAGES_DEBUG += canhalctrl \
@@ -85,10 +82,6 @@
     libcuttlefish-ril \
     libcuttlefish-rild
 
-# DRM Properities
-PRODUCT_PROPERTY_OVERRIDES += \
-    drm.service.enabled=true
-
 BOARD_IS_AUTOMOTIVE := true
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 4860b71..1261c2f 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -85,6 +85,9 @@
 # Copy preopted files from system_b on first boot
 PRODUCT_PROPERTY_OVERRIDES += ro.cp_system_other_odex=1
 
+# DRM service opt-in
+PRODUCT_PROPERTY_OVERRIDES += drm.service.enabled=true
+
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera/devices/EmulatedCamera