Merge "build: Set soong variable for enabling NFC apex bootclasspath fragment" into main

2024-01-15 21:59:44 +00:00
parent a016367cdb 7d26fd45c3
commit b4744d53e4
1 changed files with 2 additions and 1 deletions
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -93,8 +93,9 @@ ifeq ($(RELEASE_PACKAGE_NFC_STACK),NfcNci)
    PRODUCT_BOOT_JARS += \
        framework-nfc
 else
-    PRODUCT_APEX_BOOT_JARS := \
+    PRODUCT_APEX_BOOT_JARS += \
        com.android.nfcservices:framework-nfc
+    $(call soong_config_set,bootclasspath,nfc_apex_bootclasspath_fragment,true)
 endif

 # TODO(b/308174306): Adjust this after multiple prebuilts version is supported.