diff options
| author | Martijn Coenen <maco@google.com> | 2014-10-01 17:08:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 17:08:18 +0000 |
| commit | eac3e5ac6c5e0bedc6566bff10de0af86054979f (patch) | |
| tree | d93bc8575989f18e85c5b8afe4b58b48ca4392b8 /device.mk | |
| parent | 005bf68ab1318de4ec78ebebd80ab49bea9e8a3e (diff) | |
| parent | 545d13edf9a1e44cc934fd67222d5332bd5371ca (diff) | |
| download | shamu-eac3e5ac6c5e0bedc6566bff10de0af86054979f.tar.gz | |
am 545d13ed: am e4f71513: am b964476b: am e8d8c97c: Merge "Move nfcee_access.xml." into lmp-dev
* commit '545d13edf9a1e44cc934fd67222d5332bd5371ca':
Move nfcee_access.xml.
Diffstat (limited to 'device.mk')
| -rw-r--r-- | device.mk | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -270,19 +270,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 |