summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-02-17 23:20:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-17 23:20:25 +0000
commit25571a94965ce1c92645d30e7052528b7c851d8f (patch)
tree95cc64175f0d17495c7776b4efa6450474bdb773
parentd988cb11b57956297beef31a62c02628b0f6430e (diff)
parent337feff8b79e1aa8c50ef7d8d15e9076385e136b (diff)
downloaddevice_generic_armv7-a-neon-25571a94965ce1c92645d30e7052528b7c851d8f.tar.gz
device_generic_armv7-a-neon-25571a94965ce1c92645d30e7052528b7c851d8f.tar.bz2
device_generic_armv7-a-neon-25571a94965ce1c92645d30e7052528b7c851d8f.zip
Merge "Replace hardware features conf file to be emulator specific"
-rw-r--r--mini_common.mk2
1 files changed, 1 insertions, 1 deletions
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 += \
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 \