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

Commit 83438939 authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "[CrashRecovery] Conditionally add module lib to Android SDK" into main... 

Merge "[CrashRecovery] Conditionally add module lib to Android SDK" into main am: 9891943a am: 4c1c8684

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3184819



Change-Id: Ic3d7a73e5fb3156395aff696af7329029663892e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b1b177a 4c1c8684

api/Android.bp

+12 −34
Original line number Diff line number Diff line
@@ -62,40 +62,8 @@ metalava_cmd = "$(location metalava)" 
metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED "

metalava_cmd += " --quiet "



soong_config_module_type {

    name: "enable_crashrecovery_module",

    module_type: "combined_apis_defaults",

    config_namespace: "ANDROID",

    bool_variables: ["release_crashrecovery_module"],

    properties: [

        "bootclasspath",

        "system_server_classpath",

    ],

}



soong_config_bool_variable {

    name: "release_crashrecovery_module",

}



enable_crashrecovery_module {

    name: "crashrecovery_module_defaults",

    soong_config_variables: {

        release_crashrecovery_module: {

            bootclasspath: [

                "framework-crashrecovery",

            ],

            system_server_classpath: [

                "service-crashrecovery",

            ],

        },

    },

}



combined_apis {

    name: "frameworks-base-api",

    defaults: [

        "crashrecovery_module_defaults",

    ],

    bootclasspath: [

        "android.net.ipsec.ike",

        "art.module.public.api",
@@ -128,7 +96,12 @@ combined_apis { 
        "framework-virtualization",

        "framework-wifi",

        "i18n.module.public.api",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": [

            "framework-crashrecovery",

        ],

        default: [],

    }),

    system_server_classpath: [

        "service-art",

        "service-configinfrastructure",
@@ -137,7 +110,12 @@ combined_apis { 
        "service-permission",

        "service-rkp",

        "service-sdksandbox",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": [

            "service-crashrecovery",

        ],

        default: [],

    }),

}



genrule {