summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPulkit Bhuwalka <pulkitb@google.com>2017-02-17 23:31:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-17 23:31:17 +0000
commitc9d69d6c7925285a0cdbf7061961ffb172e34bbf (patch)
tree95cc64175f0d17495c7776b4efa6450474bdb773
parentd988cb11b57956297beef31a62c02628b0f6430e (diff)
parent7762cee053c7e942e12a5ceceae9f7cc227aedd2 (diff)
downloaddevice_generic_armv7-a-neon-c9d69d6c7925285a0cdbf7061961ffb172e34bbf.tar.gz
device_generic_armv7-a-neon-c9d69d6c7925285a0cdbf7061961ffb172e34bbf.tar.bz2
device_generic_armv7-a-neon-c9d69d6c7925285a0cdbf7061961ffb172e34bbf.zip
Merge "Replace hardware features conf file to be emulator specific" am: 25571a9496
am: 7762cee053 Change-Id: I9f534dda8e0fc540e0feaab38d98f5c18a959b2c
-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 \