From 46f0619f516a9727fe0d9dfaaf366625f63bf10d Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Mon, 21 Nov 2011 14:54:34 -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: Ia10ddd14359a0df853f2195716287f0dc4301ef7 --- CleanSpec.mk | 3 ++- device.mk | 4 ++++ nfcee_access_debug.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index cf089c4..cff019a 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -48,4 +48,5 @@ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Phone_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/phone_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/updatecmds/migrate_nfc.txt) diff --git a/device.mk b/device.mk index a8de975..b85e83d 100644 --- a/device.mk +++ b/device.mk @@ -133,6 +133,10 @@ PRODUCT_COPY_FILES += \ device/samsung/tuna/mms144_ts_rev31.fw:system/vendor/firmware/mms144_ts_rev31.fw \ device/samsung/tuna/mms144_ts_rev32.fw:system/vendor/firmware/mms144_ts_rev32.fw +# 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 diff --git a/nfcee_access_debug.xml b/nfcee_access_debug.xml index de0ea8e..a96a2d1 100644 --- a/nfcee_access_debug.xml +++ b/nfcee_access_debug.xml @@ -11,7 +11,7 @@ - + -- cgit v1.1