diff options
author | Nick Pelly <npelly@google.com> | 2011-11-21 14:54:34 -0800 |
---|---|---|
committer | Nick Pelly <npelly@google.com> | 2011-11-21 15:34:43 -0800 |
commit | 46f0619f516a9727fe0d9dfaaf366625f63bf10d (patch) | |
tree | ebffd424a659cf4276d67eb54067d98253085adc /device.mk | |
parent | e12c193794224e207a03d97c6ca67d94a6e8363a (diff) | |
download | device_samsung_tuna-46f0619f516a9727fe0d9dfaaf366625f63bf10d.zip device_samsung_tuna-46f0619f516a9727fe0d9dfaaf366625f63bf10d.tar.gz device_samsung_tuna-46f0619f516a9727fe0d9dfaaf366625f63bf10d.tar.bz2 |
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
Diffstat (limited to 'device.mk')
-rw-r--r-- | device.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 |