Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6d8073b authored by Roshan Pius's avatar Roshan Pius
Browse files

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
parent 14548bbe

target/product/base_system.mk

+10 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ PRODUCT_PACKAGES += \ 
    framework-location \

    framework-minus-apex \

    framework-minus-apex-install-dependencies \

    framework-nfc \

    framework-sysconfig.xml \

    fsck.erofs \

    fsck_msdos \
@@ -305,6 +304,16 @@ ifneq ($(PRODUCT_NO_DYNAMIC_SYSTEM_UPDATE),true) 


endif



# Check if the build supports NFC apex or not

ifeq ($(RELEASE_PACKAGE_NFC_STACK),NfcNci)

    PRODUCT_PACKAGES += \

        framework-nfc \

        NfcNci

else

    PRODUCT_PACKAGES += \

        com.android.nfcservices

endif



# VINTF data for system image

PRODUCT_PACKAGES += \

    system_manifest.xml \

target/product/default_art_config.mk

+9 −1
Original line number Diff line number Diff line
@@ -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.

target/product/handheld_system.mk

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ PRODUCT_PACKAGES += \ 
    UserDictionaryProvider \

    VpnDialogs \

    vr \

    $(RELEASE_PACKAGE_NFC_STACK)



PRODUCT_PACKAGES += $(RELEASE_PACKAGE_VIRTUAL_CAMERA)