summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Brissenden <sbrissen@hotmail.com>2013-12-16 18:54:10 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-12-16 18:54:10 +0000
commit6ccdc30e9e2852851450710db4c8a1cc95714ee1 (patch)
treebd42dc1adda84c7c56252f07c236f6865341516b
parentc8be4711f5a8a17bf8a0e5fd2eb433c7f5f9e7d4 (diff)
parentb5f42b43b1326611aeb0eea13aff95d67779e08f (diff)
downloaddevice_samsung_t0lte-6ccdc30e9e2852851450710db4c8a1cc95714ee1.tar.gz
device_samsung_t0lte-6ccdc30e9e2852851450710db4c8a1cc95714ee1.tar.bz2
device_samsung_t0lte-6ccdc30e9e2852851450710db4c8a1cc95714ee1.zip
Merge "t0lte: add NFC host-based card emulation" into cm-11.0
-rw-r--r--common.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 8f3e983..82d4bfc 100644
--- a/common.mk
+++ b/common.mk
@@ -53,7 +53,8 @@ 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.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
# NFCEE access control
ifeq ($(TARGET_BUILD_VARIANT),user)