boot(api): Add framework-nfc to NFC apex
Adding a conditional boot entry for framework-nfc.jar to be delivered
via NFC apex.
Also, rename the existing soong_config namespace for bootclasspath
entries to more generic "bootclasspath" (modified the existing usage to
match).
Bug: 303286040
Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=NfcNci)
Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=com.android.nfcservices)
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
Change-Id: If170240fe60120a61dcceb68f9c581261aeee49f
diff --git a/boot/Android.bp b/boot/Android.bp
index 8a3d35e..c4a1139b7 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -26,9 +26,10 @@
soong_config_module_type {
name: "custom_platform_bootclasspath",
module_type: "platform_bootclasspath",
- config_namespace: "AUTO",
+ config_namespace: "bootclasspath",
bool_variables: [
"car_bootclasspath_fragment",
+ "nfc_apex_bootclasspath_fragment",
],
properties: [
"fragments",
@@ -155,6 +156,15 @@
},
],
},
+ nfc_apex_bootclasspath_fragment: {
+ fragments: [
+ // only used if NFC mainline is enabled.
+ {
+ apex: "com.android.nfcservices",
+ module: "com.android.nfcservices-bootclasspath-fragment",
+ },
+ ],
+ },
},
// Additional information needed by hidden api processing.