Merge "Replace hardware features conf file to be emulator specific" am: 25571a9496
am: 7762cee053
Change-Id: I9f534dda8e0fc540e0feaab38d98f5c18a959b2c
diff --git a/mini_common.mk b/mini_common.mk
index 5ee22be..41ca142 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 \