build: Allow NFC stack to be delivered as a mainline module or APK
These changes are necessary to allow NFC stack delivery to be properly trunk stable flagged: 1. Delivered as NfcNci.apk and framework-nfc.jar for Android U based builds (existing). 2. Delivered as com.android.nfcservices.apex which embeds NfcNci.apk & framework-nfc.jar for Android V based builds (new). Bug: 303286040 Test: Device boots up after flashing Test: atest CtsNfcTestCases Change-Id: Ib2170146d07763ff6c852ce810497ebe1ac2eead
This commit is contained in:
@@ -51,7 +51,6 @@ PRODUCT_BOOT_JARS += \
|
||||
framework-minus-apex \
|
||||
framework-graphics \
|
||||
framework-location \
|
||||
framework-nfc \
|
||||
ext \
|
||||
telephony-common \
|
||||
voip-common \
|
||||
@@ -89,6 +88,15 @@ PRODUCT_APEX_BOOT_JARS := \
|
||||
com.android.virt:framework-virtualization \
|
||||
com.android.wifi:framework-wifi \
|
||||
|
||||
# Check if the build supports NFC apex or not
|
||||
ifeq ($(RELEASE_PACKAGE_NFC_STACK),NfcNci)
|
||||
PRODUCT_BOOT_JARS += \
|
||||
framework-nfc
|
||||
else
|
||||
PRODUCT_APEX_BOOT_JARS := \
|
||||
com.android.nfcservices:framework-nfc
|
||||
endif
|
||||
|
||||
# TODO(b/308174306): Adjust this after multiple prebuilts version is supported.
|
||||
# APEX boot jars that are not in prebuilt apexes.
|
||||
# Keep the list sorted by module names and then library names.
|
||||
|
Reference in New Issue
Block a user