diff options
| author | Martijn Coenen <maco@google.com> | 2013-05-31 22:56:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-31 22:56:38 +0000 |
| commit | fcf17b053d499b662968306209cc20eb48540424 (patch) | |
| tree | 5fb042351b3aef2b690c70d4dd5edb8ec8a2cfbd /device-common.mk | |
| parent | 3f7eb24bb2852ad6a766cb4b63f10452cde0aca8 (diff) | |
| parent | ecdedf23d37d3e62c12b24c9b5213347e119868e (diff) | |
| download | flo-fcf17b053d499b662968306209cc20eb48540424.tar.gz | |
Merge "Flo: NFC: Remove NFCEE-related files." into jb-mr2-dev
Diffstat (limited to 'device-common.mk')
| -rw-r--r-- | device-common.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/device-common.mk b/device-common.mk index f8a938f..df95240 100644 --- a/device-common.mk +++ b/device-common.mk @@ -261,19 +261,9 @@ PRODUCT_PACKAGES += \ libnfc-nci \ libnfc_nci_jni \ NfcNci \ - Tag \ - com.android.nfc_extras - -# NFCEE access control -ifeq ($(TARGET_BUILD_VARIANT),user) - NFCEE_ACCESS_PATH := device/asus/flo/nfc/nfcee_access.xml -else - NFCEE_ACCESS_PATH := device/asus/flo/nfc/nfcee_access_debug.xml -endif + Tag PRODUCT_COPY_FILES += \ - $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml \ - frameworks/native/data/etc/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 \ device/asus/flo/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \ device/asus/flo/nfc/libnfc-brcm-20791b05.conf:system/etc/libnfc-brcm-20791b05.conf |