StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Allow NFC stack to be delivered as a mainline module or APK

Browse Source 
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:
Roshan Pius
2024-01-12 13:46:24 -08:00
parent 14548bbe85
commit a6d8073bcf
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
target/product/base_system.mk
View File

@@ -95,7 +95,6 @@ PRODUCT_PACKAGES += \
framework-location \ framework-location \
framework-minus-apex \ framework-minus-apex \
framework-minus-apex-install-dependencies \ framework-minus-apex-install-dependencies \
framework-nfc \
framework-sysconfig.xml \ framework-sysconfig.xml \
fsck.erofs \ fsck.erofs \
fsck_msdos \ fsck_msdos \
@@ -305,6 +304,16 @@ ifneq ($(PRODUCT_NO_DYNAMIC_SYSTEM_UPDATE),true)
endif 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 # VINTF data for system image
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
system_manifest.xml \ system_manifest.xml \

10
target/product/default_art_config.mk
View File

@@ -51,7 +51,6 @@ PRODUCT_BOOT_JARS += \
framework-minus-apex \ framework-minus-apex \
framework-graphics \ framework-graphics \
framework-location \ framework-location \
framework-nfc \
ext \ ext \
telephony-common \ telephony-common \
voip-common \ voip-common \
@@ -89,6 +88,15 @@ PRODUCT_APEX_BOOT_JARS := \
com.android.virt:framework-virtualization \ com.android.virt:framework-virtualization \
com.android.wifi:framework-wifi \ 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. # TODO(b/308174306): Adjust this after multiple prebuilts version is supported.
# APEX boot jars that are not in prebuilt apexes. # APEX boot jars that are not in prebuilt apexes.
# Keep the list sorted by module names and then library names. # Keep the list sorted by module names and then library names.

1
target/product/handheld_system.mk
View File

@@ -73,7 +73,6 @@ PRODUCT_PACKAGES += \
UserDictionaryProvider \ UserDictionaryProvider \
VpnDialogs \ VpnDialogs \
vr \ vr \
$(RELEASE_PACKAGE_NFC_STACK)
PRODUCT_PACKAGES += $(RELEASE_PACKAGE_VIRTUAL_CAMERA) PRODUCT_PACKAGES += $(RELEASE_PACKAGE_VIRTUAL_CAMERA)