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

am: 557ce055e7

Change-Id: I559d7aa1a6f6bf65da33327c9a900b08c78869e0
This commit is contained in:
Colin Cross
2017-02-21 23:31:31 +00:00
committed by android-build-merger

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)