commit fbcb931cb34fe4838a18e0774e160f3a405d8027
author Bjoern Johansson <bjoernj@google.com> Thu May 05 15:45:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 05 15:45:00 2016 +0000
tree 815e92759c9802eb9b0508d00092362c6e9884a6
parent 69d4aa2d5076988d252fbdf1e7ed7d6be05300aa
parent 513e69ec69a7e5c61888668a4b16ccab6073419c

Merge "Indicate that all emulator images support USB" into nyc-dev
am: 513e69ec69

* commit '513e69ec69a7e5c61888668a4b16ccab6073419c':
  Indicate that all emulator images support USB

Change-Id: If3567c18390a3875f5523e3a91ad4514d7c59c2d

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