summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRicardo Cerqueira <ricardo@cyngn.com>2015-02-10 23:58:10 +0000
committerAdnan Begovic <adnan@cyngn.com>2015-10-06 18:15:29 -0700
commitfd626928421e88a6dc3b95ef178179bd511ca152 (patch)
tree7fd4f3843a8cd9b263df89f70c78d11eff6a5469 /target
parent3d4039a101a6b7dc06f25048c354a1f37e1b2ccb (diff)
downloadbuild-fd626928421e88a6dc3b95ef178179bd511ca152.zip
build-fd626928421e88a6dc3b95ef178179bd511ca152.tar.gz
build-fd626928421e88a6dc3b95ef178179bd511ca152.tar.bz2
Revert "Add handheld_core_hardware.xml to telephony base"
Don't do this. handheld_core_hardware.xml includes feature declarations that aren't mandatory, particularly cameras and magnetometers, but also things like managed users. According to the CDD, these are optional. Go back to the pre-L mechanism of including the declarations per-device to make them accurate. This reverts commit dccce7bbe9673d4b8ce1a3559182767f926e1ff8. Conflicts: target/product/full_base_telephony.mk Change-Id: I6db55082295171b78fe595e783799ee54458c4fd
Diffstat (limited to 'target')
-rw-r--r--target/product/full_base_telephony.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
index 4d6fce7..7988e9b 100644
--- a/target/product/full_base_telephony.mk
+++ b/target/product/full_base_telephony.mk
@@ -22,8 +22,5 @@
PRODUCT_PROPERTY_OVERRIDES := \
keyguard.no_require_sim=true
-PRODUCT_COPY_FILES := \
- 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)