Merge "Ensure WMShell protolog viewer config is available on device when required" into main (a5884c02) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/Android.bp

+8 −4

Original line number	Diff line number	Diff line
		@@ -234,10 +234,6 @@ android_library {
		// *.kt sources are inside a filegroup.
		"kotlin-annotations",
		],
		required: [
		"wmshell.protolog.json.gz",
		"wmshell.protolog.pb",
		],
		flags_packages: [
		"com_android_wm_shell_flags",
		],
		@@ -246,3 +242,11 @@ android_library {
		plugins: ["dagger2-compiler"],
		use_resource_processor: true,
		}

		java_defaults {
		name: "wmshell_defaults",
		required: [
		"wmshell.protolog.json.gz",
		"wmshell.protolog.pb",
		],
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -1022,6 +1022,7 @@ android_app {
		defaults: [
		"platform_app_defaults",
		"SystemUI_optimized_defaults",
		"wmshell_defaults",
		],
		static_libs: [
		"SystemUI-core",