From 7d26fd45c375261e207910e406b42e4d9f3de2b1 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 13 Jan 2024 12:00:01 -0800 Subject: [PATCH] build: Set soong variable for enabling NFC apex bootclasspath fragment Bug: 303286040 Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=NfcNci) Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=com.android.nfcservices) Change-Id: Ibd1e28c7b6bcbff81c98e6be91d6a11b1e3ab1ae --- target/product/default_art_config.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index 11ab38fa71..0306c58a46 100644 --- 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.