commit b4b8344fd85889741c7755a1f2982e8e4acb0b8a
author Jayant Chowdhary <jchowdhary@google.com> Tue May 12 19:23:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 12 19:23:23 2020 +0000
tree 3767340a1c2e6382761c127f2b9f5226a457d4e4
parent b3d04c9e28b88d01219968f96f8f07d5b3903e27
parent ff20bcd431b09a970f38787a7776d4b177682bbc

Merge "Add FEATURE_CAMERA_CONCURRENT to cuttlefish." into rvc-dev am: ff20bcd431

Change-Id: Ifd5f084f2eda03d034fb6c5f860155aca699e064

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 87b32c5..2a7c64e 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -196,6 +196,7 @@
     frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
     frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \
     frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \
+    frameworks/native/data/etc/android.hardware.camera.concurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.concurrent.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
     frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
     frameworks/native/data/etc/android.hardware.reboot_escrow.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.reboot_escrow.xml \