aboutsummaryrefslogtreecommitdiff
path: root/shinano.mk
diff options
context:
space:
mode:
authorGiulio Cervera <giulio.cervera@cyanogenmod.org>2014-07-14 18:48:45 +0200
committerGiulio Cervera <giulio.cervera@cyanogenmod.org>2014-07-14 18:55:03 +0200
commitc316a0b44c7887a911c538f096e271c41f3151f3 (patch)
tree89c91fb31860da93c23b6d4095ed36b3093aaab4 /shinano.mk
parent5d4ba242b71c381e1c60393112295169c69be2fe (diff)
shinano: update nfc config
Change-Id: Ie22a76edf352564ae2de030e359fd46c88662999
Diffstat (limited to 'shinano.mk')
-rw-r--r--shinano.mk20
1 files changed, 4 insertions, 16 deletions
diff --git a/shinano.mk b/shinano.mk
index 67085d3..7714083 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -26,8 +26,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.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.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
@@ -36,7 +34,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
- frameworks/native/data/etc/com.android.nfc_extras.xml:system/etc/permissions/com.google.android.nfc_extras.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
# Init
@@ -103,25 +100,16 @@ PRODUCT_PACKAGES += \
# NFC
PRODUCT_PACKAGES += \
- libnfc \
- libnfc_jni \
- Nfc \
+ NfcNci \
Tag \
com.android.nfc_extras
PRODUCT_COPY_FILES += \
+ $(COMMON_PATH)/rootdir/system/etc/nfcee_access.xml:system/etc/nfcee_access.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/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml
-# NFCEE access control
-ifeq ($(TARGET_BUILD_VARIANT),user)
- NFCEE_ACCESS_PATH := $(COMMON_PATH)/rootdir/system/etc/nfcee_access.xml
-else
- NFCEE_ACCESS_PATH := $(COMMON_PATH)/rootdir/system/etc/nfcee_access_debug.xml
-endif
-
-PRODUCT_COPY_FILES += \
- $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml
-
# Qualcomm Random Number Generator
PRODUCT_PACKAGES += \
qrngd \