commit 557ce055e76da1bb705738dd6f726909aa4fab8c
author Colin Cross <ccross@android.com> Tue Feb 21 23:25:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 21 23:25:07 2017 +0000
tree 3f50c011ce0aa981efebfa94d0bd7499eac81623
parent 70aac88a616d935ea1d7642a984b0dc17ecf0b7d
parent efa6ae84ca235919249e3c75003450605e485beb

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

target/product/full_base_telephony.mk

diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
index 3d195a1..9a2c63a 100644
--- a/target/product/full_base_telephony.mk
+++ b/target/product/full_base_telephony.mk
@@ -25,7 +25,7 @@
 
 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)