diff options
| author | Martijn Coenen <maco@google.com> | 2014-10-01 02:39:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-01 02:39:50 +0000 |
| commit | e8d8c97c5d213a0f88c7dbff9c1698651c9d0a75 (patch) | |
| tree | a105dad6d526941d7e80202f03725f98c28aa094 /device.mk | |
| parent | db21db32ed21fa6a8a45057a1cb8d14c6966013e (diff) | |
| parent | c6ee8cb0526d455ebdc78af72487c4d54c089890 (diff) | |
| download | shamu-e8d8c97c5d213a0f88c7dbff9c1698651c9d0a75.tar.gz | |
Merge "Move nfcee_access.xml." into lmp-dev
Diffstat (limited to 'device.mk')
| -rw-r--r-- | device.mk | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -273,19 +273,11 @@ PRODUCT_PACKAGES += \ NfcNci \ Tag -# NFCEE access control -ifeq ($(TARGET_BUILD_VARIANT),user) - NFCEE_ACCESS_PATH := device/moto/shamu/nfc/nfcee_access.xml -else - NFCEE_ACCESS_PATH := device/moto/shamu/nfc/nfcee_access_debug.xml -endif - PRODUCT_COPY_FILES += \ 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 \ device/moto/shamu/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \ - device/moto/shamu/nfc/libnfc-brcm-20795a10.conf:system/etc/libnfc-brcm-20795a10.conf \ - $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml + device/moto/shamu/nfc/libnfc-brcm-20795a10.conf:system/etc/libnfc-brcm-20795a10.conf PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ persist.sys.usb.config=mtp |