aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Hu <bohu@google.com>2015-09-16 17:57:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-16 17:57:17 +0000
commit6d98051a8fab8ba37e661b746f024907b2425be4 (patch)
treec9a90c8739360c442669ed3fbbd460e10f3aa9c3
parentf4fc29b08c4d3f8620ceffd233c99dc0712fed78 (diff)
parent8cb586a55569862a6d33afbab0ceadcac4b321ab (diff)
downloadbuild-6d98051a8fab8ba37e661b746f024907b2425be4.tar.gz
am 8cb586a5: am ca352f36: am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev
* commit '8cb586a55569862a6d33afbab0ceadcac4b321ab': emulator.mk: Add ethernet permission
-rw-r--r--target/product/emulator.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 982f7da1c9..7394d4fc50 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -50,6 +50,7 @@ PRODUCT_PACKAGES += \
sensors.ranchu
PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \
device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \
device/generic/goldfish/init.goldfish.sh:system/etc/init.goldfish.sh \