Merge "[CrashRecovery] Add module lib to Android SDK" into main (8bd00f3f) · Commits · e / os / android_frameworks_base

api/Android.bp

+32 −0

Original line number	Original line	Diff line number	Diff line
	@@ -60,8 +60,40 @@ metalava_cmd = "$(location metalava)"
	metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED "		metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED "
	metalava_cmd += " --quiet "		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 {		combined_apis {
	name: "frameworks-base-api",		name: "frameworks-base-api",
			defaults: [
			"crashrecovery_module_defaults",
			],
	bootclasspath: [		bootclasspath: [
	"android.net.ipsec.ike",		"android.net.ipsec.ike",
	"art.module.public.api",		"art.module.public.api",

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@ soong_config_module_type {
	bool_variables: [		bool_variables: [
	"car_bootclasspath_fragment",		"car_bootclasspath_fragment",
	"nfc_apex_bootclasspath_fragment",		"nfc_apex_bootclasspath_fragment",
			"release_crashrecovery_module",
	],		],
	properties: [		properties: [
	"fragments",		"fragments",
	@@ -165,6 +166,15 @@ custom_platform_bootclasspath {
	},		},
	],		],
	},		},
			release_crashrecovery_module: {
			fragments: [
			// only used when crashrecovery is enabled
			{
			apex: "com.android.crashrecovery",
			module: "com.android.crashrecovery-bootclasspath-fragment",
			},
			],
			},
	},		},

	// Additional information needed by hidden api processing.		// Additional information needed by hidden api processing.