Merge "Reapply "Make framework-virtualization APIs available for framework"" into main (ca2cb1ed) · Commits · e / os / android_frameworks_base

Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -437,6 +437,7 @@ java_library {
		name: "framework-non-updatable-unbundled-impl-libs",
		static_libs: [
		"framework-location.impl",
		"framework-virtualization.impl",
		] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
		"true": [],
		default: [
		@@ -458,7 +459,6 @@ java_defaults {
		name: "framework-minus-apex-with-libs-defaults",
		defaults: ["framework-minus-apex-defaults"],
		libs: [
		"framework-virtualization.stubs.module_lib",
		"framework-non-updatable-unbundled-impl-libs",
		],
		}
		@@ -494,6 +494,7 @@ java_library {
		"//packages/modules/NeuralNetworks:__subpackages__",
		// TODO(b/429127828): Clean this up along with RELEASE_TELEPHONY_MODULE
		"//packages/modules/Telephony/framework:__subpackages__",
		"//packages/modules/Virtualization:__subpackages__",
		],
		compile_dex: false,
		headers_only: true,

+1 −0

Original line number	Diff line number	Diff line
		@@ -514,6 +514,7 @@ java_defaults {
		"//packages/modules/NeuralNetworks:__subpackages__",
		// TODO(b/429127828): Clean this up along with RELEASE_TELEPHONY_MODULE
		"//packages/modules/Telephony/framework:__subpackages__",
		"//packages/modules/Virtualization:__subpackages__",
		],
		plugins: ["error_prone_android_framework"],
		errorprone: {