diff options
| author | Colin Cross <ccross@android.com> | 2017-02-21 23:31:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-21 23:31:23 +0000 |
| commit | dd168c481dcb14c7932c7026ac7c8b4af128e4a5 (patch) | |
| tree | 4e403060344a211ed714971bd09429929ba4ebf4 | |
| parent | 7762cee053c7e942e12a5ceceae9f7cc227aedd2 (diff) | |
| parent | 15314896f3fae5a287fa61933718d58fbd44969f (diff) | |
| download | device_generic_armv7-a-neon-dd168c481dcb14c7932c7026ac7c8b4af128e4a5.tar.gz device_generic_armv7-a-neon-dd168c481dcb14c7932c7026ac7c8b4af128e4a5.tar.bz2 device_generic_armv7-a-neon-dd168c481dcb14c7932c7026ac7c8b4af128e4a5.zip | |
Merge "Revert "Replace hardware features conf file to be emulator specific""android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4
am: 15314896f3
Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16
| -rw-r--r-- | mini_common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 += \ 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 \ |