Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9667b043 authored by Roshan Pius's avatar Roshan Pius
Browse files

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
parent 193caa93

boot/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ package { 
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 @@ custom_platform_bootclasspath { 
                },

            ],

        },

        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.

nfc/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ java_sdk_library { 
    lint: {

        strict_updatability_linting: true,

    },

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

    ],

}



filegroup {