From 3623340d5837d9f6198494e383e58dd66fc2af15 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Mon, 21 Nov 2011 14:49:42 -0800 Subject: Replace vendor specific NfcGoogle.apk with generic Nfc.apk The access control changes allow us to just use Nfc.apk with the regular platform certificate, instead of the custom signed NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle and just build it out of packages/apps/Nfc now. The package name is also reverted from com.android.nfc3 to com.android.nfc The NFC uid needs to get bumped (25 to 27) to allow the cert change. Bug: 5608249 Change-Id: Ib6e8fadea1b6ba0b1fcbeda5453a2a2cd4fbd0c6 --- device_base.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'device_base.mk') diff --git a/device_base.mk b/device_base.mk index c59b699..0f43cf1 100644 --- a/device_base.mk +++ b/device_base.mk @@ -77,6 +77,17 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/samsung/crespo/samsung_mfc_fw.bin:system/vendor/firmware/samsung_mfc_fw.bin +# NFC +PRODUCT_PACKAGES += \ + libnfc \ + libnfc_jni \ + Nfc \ + Tag + +# Commands to migrate prefs from com.android.nfc3 to com.android.nfc +PRODUCT_COPY_FILES += \ + packages/apps/Nfc/migrate_nfc.txt:system/etc/updatecmds/migrate_nfc.txt + # file that declares the MIFARE NFC constant PRODUCT_COPY_FILES += \ device/sample/nxp/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml @@ -97,7 +108,7 @@ PRODUCT_COPY_FILES += \ $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml # Generated kcm keymaps -PRODUCT_PACKAGES := \ +PRODUCT_PACKAGES += \ s3c-keypad.kcm \ cypress-touchkey.kcm -- cgit v1.1