Merge "[CrashRecovery] Conditionally add module lib to Android SDK" into main (9891943a) · Commits · e / os / android_frameworks_base

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 {