Merge "Revert "Replace hardware features conf file to be emulator specific""

This commit is contained in:
Colin Cross 2017-02-21 23:25:05 +00:00 committed by Gerrit Code Review
commit 557ce055e7

View file

@ -25,7 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
PRODUCT_COPY_FILES := \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
device/generic/goldfish/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)