commit a328fdd779b01817134cbbe990a82eab61bbe5d1
author Colin Cross <ccross@android.com> Sat Feb 18 20:05:37 2017 +0000
committer Colin Cross <ccross@android.com> Sat Feb 18 20:05:37 2017 +0000
tree 4e403060344a211ed714971bd09429929ba4ebf4
parent 337feff8b79e1aa8c50ef7d8d15e9076385e136b

Revert "Replace hardware features conf file to be emulator specific"

This reverts commit 337feff8b79e1aa8c50ef7d8d15e9076385e136b.

Change-Id: I17323c6053a42f4cc0fbb902cfd101f7783f7e29

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 \