Merge "Revert^2 "[CrashRecovery] Add module lib to Android SDK"" into main (b87d24f3) · Commits · e / os / android_frameworks_base

api/Android.bp

+32 −0

Original line number	Diff line number	Diff line
		@@ -69,8 +69,40 @@ genrule {
		visibility: ["//visibility:public"],
		}

		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",

+10 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ soong_config_module_type {
		config_namespace: "AUTO",
		bool_variables: [
		"car_bootclasspath_fragment",
		"release_crashrecovery_module",
		],
		properties: [
		"fragments",
		@@ -155,6 +156,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.