commit 513e69ec69a7e5c61888668a4b16ccab6073419c
author Bjoern Johansson <bjoernj@google.com> Thu May 05 15:38:32 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 05 15:38:32 2016 +0000
tree 815e92759c9802eb9b0508d00092362c6e9884a6
parent 5461c2f0cb4156b71f854c03f8516ff1ac9e5964
parent 6b04d94ff7b16839e1b19a0602cacdeaed909c4a

Merge "Indicate that all emulator images support USB" into nyc-dev

target/product/emulator.mk

diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index d02c547..b08a28a 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -60,7 +60,8 @@
     device/generic/goldfish/ueventd.goldfish.rc:root/ueventd.goldfish.rc \
     device/generic/goldfish/init.ranchu.rc:root/init.ranchu.rc \
     device/generic/goldfish/fstab.ranchu:root/fstab.ranchu \
-    device/generic/goldfish/ueventd.ranchu.rc:root/ueventd.ranchu.rc
+    device/generic/goldfish/ueventd.ranchu.rc:root/ueventd.ranchu.rc \
+    frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml
 
 PRODUCT_PACKAGE_OVERLAYS := device/generic/goldfish/overlay