commit dd168c481dcb14c7932c7026ac7c8b4af128e4a5
author Colin Cross <ccross@android.com> Tue Feb 21 23:31:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 23:31:23 2017 +0000
tree 4e403060344a211ed714971bd09429929ba4ebf4
parent 7762cee053c7e942e12a5ceceae9f7cc227aedd2
parent 15314896f3fae5a287fa61933718d58fbd44969f

Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 15314896f3

Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16

mini_common.mk

diff --git a/mini_common.mk b/mini_common.mk
index 41ca142..5ee22be 100644
--- a/mini_common.mk
+++ b/mini_common.mk
@@ -64,13 +64,13 @@
 PRODUCT_PACKAGES += camera.goldfish.jpeg
 
 PRODUCT_COPY_FILES += \
-    device/generic/goldfish/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
     frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
     frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
     frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \
     frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
     frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
+    frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.carrier=unknown \