diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-14 15:19:02 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-11-14 16:06:04 -0800 |
| commit | 9875dfc13232b0ab2225db00177e445ffbda801b (patch) | |
| tree | 262c0fabebdbf0f687f07843c53fe5ad58651c2a /device_base.mk | |
| parent | 9c87fac09fa9d4429a7d037ac154a6a2369f5db9 (diff) | |
| download | device_samsung_crespo-9875dfc13232b0ab2225db00177e445ffbda801b.zip device_samsung_crespo-9875dfc13232b0ab2225db00177e445ffbda801b.tar.gz device_samsung_crespo-9875dfc13232b0ab2225db00177e445ffbda801b.tar.bz2 | |
Follow-up fixes to NFC access control changes.
Add platform test signature to nfcee_access_debug.xml.
Move other NFCEE xml from vendor/ to device/
Fix tuna->crespo references.
Change-Id: I5da4a50d2b1c502c1ba0b3c7d30013e797e1a818
Diffstat (limited to 'device_base.mk')
| -rw-r--r-- | device_base.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/device_base.mk b/device_base.mk index e75d181..c59b699 100644 --- a/device_base.mk +++ b/device_base.mk @@ -77,11 +77,21 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/samsung/crespo/samsung_mfc_fw.bin:system/vendor/firmware/samsung_mfc_fw.bin +# file that declares the MIFARE NFC constant +PRODUCT_COPY_FILES += \ + device/sample/nxp/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml + +# NFC EXTRAS add-on API +PRODUCT_PACKAGES += \ + com.android.nfc_extras +PRODUCT_COPY_FILES += \ + frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml + # NFCEE access control ifeq ($(TARGET_BUILD_VARIANT),user) - NFCEE_ACCESS_PATH := device/samsung/tuna/nfcee_access.xml + NFCEE_ACCESS_PATH := device/samsung/crespo/nfcee_access.xml else - NFCEE_ACCESS_PATH := device/samsung/tuna/nfcee_access_debug.xml + NFCEE_ACCESS_PATH := device/samsung/crespo/nfcee_access_debug.xml endif PRODUCT_COPY_FILES += \ $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml @@ -153,7 +163,6 @@ endif # These are the hardware-specific features PRODUCT_COPY_FILES += \ - device/sample/nxp/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml \ frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ frameworks/base/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \ frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ |