Merge "Make protolog common srcs a library" into main (80cf43c3) · Commits · e / os / android_frameworks_base

core/java/Android.bp

+14 −1

Original line number	Diff line number	Diff line
		@@ -656,6 +656,17 @@ filegroup {
		],
		}

		java_library {
		name: "protolog-common-lib",
		srcs: [
		":protolog-common-src",
		],
		host_supported: true,
		static_libs: [
		"framework-annotations-lib",
		],
		}

		java_library {
		name: "protolog-group",
		srcs: [
		@@ -693,9 +704,11 @@ java_library {
		java_library {
		name: "protolog-groups",
		srcs: [
		":protolog-common-src",
		"com/android/internal/protolog/WmProtoLogGroups.java",
		],
		static_libs: [
		"protolog-common-lib",
		],
		}

		// protolog end

+3 −2

Original line number	Diff line number	Diff line
		@@ -26,9 +26,11 @@ package {
		java_library {
		name: "wm_shell_protolog-groups",
		srcs: [
		":protolog-common-src",
		"src/com/android/wm/shell/protolog/ShellProtoLogGroup.java",
		],
		static_libs: [
		"protolog-common-lib",
		],
		}

		filegroup {
		@@ -159,7 +161,6 @@ java_library {
		android_library {
		name: "WindowManager-Shell",
		srcs: [
		":wm_shell_protolog_src",
		// TODO(b/168581922) protologtool do not support kotlin(*.kt)
		":wm_shell-aidls",
		":wm_shell-shared-aidls",

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@ package {
		java_library_host {
		name: "protologtool-lib",
		srcs: [
		":protolog-common-src",
		"src/com/android/protolog/tool/*/.kt",
		],
		static_libs: [
		@@ -18,6 +17,7 @@ java_library_host {
		"jsonlib",
		"perfetto_trace-full",
		"platformprotos",
		"protolog-common-lib",
		],
		}