commit 24888c0f4ab6dcd3957a105862a1d9cdab50e059
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 20 17:52:52 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 20 17:52:52 2019 +0000
tree c937509bc95df83f3777821c8ce4c8a2afb902c1
parent fc5b0bbf2c86daeeaa5c3813f0abc9dcf680fc14
parent 87e9d40a2345226a0b4b3d226c5cea97b2921bfc

Merge "Add the composite disk proto shared library."

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 2a5fb08..81c2ef3 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -19,7 +19,6 @@
 PRODUCT_PACKAGES := com.android.apex.cts.shim.v1_prebuilt
 
 PRODUCT_SHIPPING_API_LEVEL := 29
-PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
 PRODUCT_BUILD_BOOT_IMAGE := true
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
 DISABLE_RILD_OEM_HOOK := true
@@ -98,6 +97,10 @@
     libGLESv1_CM_swiftshader \
     libGLESv2_swiftshader
 
+# GL implementation for virgl
+PRODUCT_PACKAGES += \
+    libGLES_mesa
+
 DEVICE_PACKAGE_OVERLAYS := device/google/cuttlefish/shared/overlay
 # PRODUCT_AAPT_CONFIG and PRODUCT_AAPT_PREF_CONFIG are intentionally not set to
 # pick up every density resources.
@@ -216,6 +219,7 @@
 # Drm HAL
 #
 PRODUCT_PACKAGES += \
+    android.hardware.drm@1.0-impl \
     android.hardware.drm@1.0-service \
     android.hardware.drm@1.2-service.clearkey