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

Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main am: c5b4b824ae am: 18e2263dad

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2909038

Change-Id: I9d711a9bcb05cca27f31157a4cdca758bd37e233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-13 23:42:36 +00:00
committed by Automerger Merge Worker
parent f12a0f6259 18e2263dad
commit d4fd7da76a
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

@@ -94,7 +94,6 @@ PRODUCT_PACKAGES += \
framework-graphics \ framework-graphics \
framework-minus-apex \ framework-minus-apex \
framework-minus-apex-install-dependencies \ framework-minus-apex-install-dependencies \
framework-nfc \
framework-res \ framework-res \
framework-sysconfig.xml \ framework-sysconfig.xml \
fsck.erofs \ fsck.erofs \
@@ -302,6 +301,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

@@ -50,7 +50,6 @@ PRODUCT_TEST_ONLY_ART_BOOT_IMAGE_JARS := \
PRODUCT_BOOT_JARS += \ PRODUCT_BOOT_JARS += \
framework-minus-apex \ framework-minus-apex \
framework-graphics \ framework-graphics \
framework-nfc \
ext \ ext \
telephony-common \ telephony-common \
voip-common \ voip-common \
@@ -88,6 +87,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_SYSTEM_SERVER_APPS += \ PRODUCT_SYSTEM_SERVER_APPS += \