Merge "Remove json viewer config" into main (bfec7e75) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/protolog/ProtoLogImpl.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -17,8 +17,6 @@
		package com.android.internal.protolog;

		import static com.android.internal.protolog.common.ProtoLogToolInjected.Value.CACHE_UPDATER;
		import static com.android.internal.protolog.common.ProtoLogToolInjected.Value.LEGACY_OUTPUT_FILE_PATH;
		import static com.android.internal.protolog.common.ProtoLogToolInjected.Value.LEGACY_VIEWER_CONFIG_PATH;
		import static com.android.internal.protolog.common.ProtoLogToolInjected.Value.LOG_GROUPS;
		import static com.android.internal.protolog.common.ProtoLogToolInjected.Value.VIEWER_CONFIG_PATH;

		@@ -46,12 +44,6 @@ public class ProtoLogImpl {
		@ProtoLogToolInjected(VIEWER_CONFIG_PATH)
		private static String sViewerConfigPath;

		@ProtoLogToolInjected(LEGACY_VIEWER_CONFIG_PATH)
		private static String sLegacyViewerConfigPath;

		@ProtoLogToolInjected(LEGACY_OUTPUT_FILE_PATH)
		private static String sLegacyOutputFilePath;

		@ProtoLogToolInjected(LOG_GROUPS)
		private static TreeMap<String, IProtoLogGroup> sLogGroups;

core/java/com/android/internal/protolog/common/ProtoLogToolInjected.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ import java.lang.annotation.Target;
		public @interface ProtoLogToolInjected {
		enum Value {
		VIEWER_CONFIG_PATH,
		LEGACY_OUTPUT_FILE_PATH,
		LEGACY_VIEWER_CONFIG_PATH,
		LOG_GROUPS,
		CACHE_UPDATER
		}

libs/WindowManager/Shell/Android.bp

+0 −35

Original line number	Diff line number	Diff line
		@@ -72,30 +72,11 @@ java_genrule {
		"--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
		"--loggroups-jar $(location :wm_shell_protolog-groups) " +
		"--viewer-config-file-path /system_ext/etc/wmshell.protolog.pb " +
		"--legacy-viewer-config-file-path /system_ext/etc/wmshell.protolog.json.gz " +
		"--legacy-output-file-path /data/misc/wmtrace/shell_log.winscope " +
		"--output-srcjar $(out) " +
		"$(locations :wm_shell-sources)",
		out: ["wm_shell_protolog.srcjar"],
		}

		java_genrule {
		name: "generate-wm_shell_protolog.json",
		srcs: [
		":wm_shell-sources",
		":wm_shell_protolog-groups",
		],
		tools: ["protologtool"],
		cmd: "$(location protologtool) generate-viewer-config " +
		"--protolog-class com.android.internal.protolog.ProtoLog " +
		"--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
		"--loggroups-jar $(location :wm_shell_protolog-groups) " +
		"--viewer-config-type json " +
		"--viewer-config $(out) " +
		"$(locations :wm_shell-sources)",
		out: ["wm_shell_protolog.json"],
		}

		java_genrule {
		name: "gen-wmshell.protolog.pb",
		srcs: [
		@@ -107,26 +88,11 @@ java_genrule {
		"--protolog-class com.android.internal.protolog.ProtoLog " +
		"--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
		"--loggroups-jar $(location :wm_shell_protolog-groups) " +
		"--viewer-config-type proto " +
		"--viewer-config $(out) " +
		"$(locations :wm_shell-sources)",
		out: ["wmshell.protolog.pb"],
		}

		java_genrule {
		name: "protolog.json.gz",
		srcs: [":generate-wm_shell_protolog.json"],
		out: ["wmshell.protolog.json.gz"],
		cmd: "gzip -c < $(in) > $(out)",
		}

		prebuilt_etc {
		name: "wmshell.protolog.json.gz",
		system_ext_specific: true,
		src: ":protolog.json.gz",
		filename_from_src: true,
		}

		prebuilt_etc {
		name: "wmshell.protolog.pb",
		system_ext_specific: true,
		@@ -216,7 +182,6 @@ android_library {
		java_defaults {
		name: "wmshell_defaults",
		required: [
		"wmshell.protolog.json.gz",
		"wmshell.protolog.pb",
		],
		}

services/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -407,7 +407,6 @@ system_java_library {

		required: [
		"libukey2_jni_shared",
		"protolog.conf.json.gz",
		"core.protolog.pb",
		],
		lint: {

services/core/Android.bp

+0 −33

Original line number	Diff line number	Diff line
		@@ -64,30 +64,11 @@ java_genrule {
		"--loggroups-class com.android.internal.protolog.WmProtoLogGroups " +
		"--loggroups-jar $(location :protolog-groups) " +
		"--viewer-config-file-path /etc/core.protolog.pb " +
		"--legacy-viewer-config-file-path /system/etc/protolog.conf.json.gz " +
		"--legacy-output-file-path /data/misc/wmtrace/wm_log.winscope " +
		"--output-srcjar $(out) " +
		"$(locations :services.core-sources-am-wm)",
		out: ["services.core.protolog.srcjar"],
		}

		java_genrule {
		name: "generate-protolog.json",
		srcs: [
		":protolog-groups",
		":services.core-sources-am-wm",
		],
		tools: ["protologtool"],
		cmd: "$(location protologtool) generate-viewer-config " +
		"--protolog-class com.android.internal.protolog.ProtoLog " +
		"--loggroups-class com.android.internal.protolog.WmProtoLogGroups " +
		"--loggroups-jar $(location :protolog-groups) " +
		"--viewer-config-type json " +
		"--viewer-config $(out) " +
		"$(locations :services.core-sources-am-wm)",
		out: ["services.core.protolog.json"],
		}

		java_genrule {
		name: "gen-core.protolog.pb",
		srcs: [
		@@ -99,7 +80,6 @@ java_genrule {
		"--protolog-class com.android.internal.protolog.ProtoLog " +
		"--loggroups-class com.android.internal.protolog.WmProtoLogGroups " +
		"--loggroups-jar $(location :protolog-groups) " +
		"--viewer-config-type proto " +
		"--viewer-config $(out) " +
		"$(locations :services.core-sources-am-wm)",
		out: ["core.protolog.pb"],
		@@ -192,7 +172,6 @@ java_library_static {
		required: [
		"default_television.xml",
		"gps_debug.conf",
		"protolog.conf.json.gz",
		"core.protolog.pb",
		],

		@@ -327,18 +306,6 @@ prebuilt_etc {
		src: "java/com/android/server/location/gnss/gps_debug.conf",
		}

		java_genrule {
		name: "services.core.json.gz",
		srcs: [":generate-protolog.json"],
		out: ["services.core.protolog.json.gz"],
		cmd: "gzip -c < $(in) > $(out)",
		}

		prebuilt_etc {
		name: "protolog.conf.json.gz",
		src: ":services.core.json.gz",
		}

		prebuilt_etc {
		name: "core.protolog.pb",
		src: ":gen-core.protolog.pb",