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

Commit 15ceb0bb authored by Frank Wang's avatar Frank Wang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Add SupplementalProcess stubs and bootclasspath ...""

parents d831a3dd 07861f70

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ java_library_with_nonpublic_deps { 
    soong_config_variables: {

        include_nonpublic_framework_api: {

            static_libs: [

                "framework-auxiliary.impl",

                "framework-supplementalapi.impl",

            ],

        },

ApiDocs.bp

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ stubs_defaults { 
        ":i18n.module.public.api{.public.stubs.source}",



        ":framework-appsearch-sources",

        ":framework-auxiliary-sources",

        ":framework-connectivity-sources",

        ":framework-bluetooth-sources",

        ":framework-connectivity-tiramisu-updatable-sources",

api/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ combined_apis { 
        "i18n.module.public.api",

    ],

    conditional_bootclasspath: [

        "framework-auxiliary",

        "framework-supplementalapi",

    ],

    system_server_classpath: [

boot/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ platform_bootclasspath { 
            apex: "com.android.art",

            module: "art-bootclasspath-fragment",

        },

        {

            apex: "com.android.auxiliary",

            module: "com.android.auxiliary-bootclasspath-fragment",

        },

        {

            apex: "com.android.conscrypt",

            module: "com.android.conscrypt-bootclasspath-fragment",