Merge "Replace hardware features conf file to be emulator specific" am: 25571a9496 am: 7762cee053
am: c9d69d6c79

Change-Id: Ifa3ecb1b911be2a80c197c9636fa9b8125ed86cd
diff --git a/mini_common.mk b/mini_common.mk
index 9731c7e..64c73f7 100644
--- a/mini_common.mk
+++ b/mini_common.mk
@@ -63,13 +63,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 \