summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhisek Devkota <ciwrl@cyanogenmod.com>2014-04-01 00:45:29 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-04-01 00:45:29 +0000
commit89f997689fc3be276650d6cd02839003608295de (patch)
tree7b908c3066dc45924488b92250f0a49dee640428
parentfdd7f33331ee129a745e4d029ddd2529aa27791e (diff)
parent65ff923cc855775496d276567e5c7c067ac90ba1 (diff)
downloaddevice_samsung_t0lte-89f997689fc3be276650d6cd02839003608295de.tar.gz
device_samsung_t0lte-89f997689fc3be276650d6cd02839003608295de.tar.bz2
device_samsung_t0lte-89f997689fc3be276650d6cd02839003608295de.zip
Merge "Revert "t0lte: add NFC host-based card emulation"" into cm-11.0
-rw-r--r--common.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 82d4bfc..8f3e983 100644
--- a/common.mk
+++ b/common.mk
@@ -53,8 +53,7 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
packages/apps/Nfc/migrate_nfc.txt:system/etc/updatecmds/migrate_nfc.txt \
frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \
- frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
- frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml
+ frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml
# NFCEE access control
ifeq ($(TARGET_BUILD_VARIANT),user)