commit 4b92ced0098ae3a36a539bd994557de3b71b224c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 08 23:43:16 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 08 23:43:16 2024 +0000
tree 41a3a347028e966cb820e5a85e917f92f5e3f1f9
parent c177e66cf0edbcfd8164a1eeffd57c8ab3023b6e
parent 9bcf34f22a6fcd18e1d8c88aa498b6e9ae59ed00

Merge "Update google-java-format-diff" into main

common/m2/Android.bp

diff --git a/common/m2/Android.bp b/common/m2/Android.bp
index 84013e8..cb0c6c8 100644
--- a/common/m2/Android.bp
+++ b/common/m2/Android.bp
@@ -585,4 +585,9 @@
     host_supported: true,
     jars: ["repository/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar"],
     sdk_version: "current",
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }

linux-x86_64/perfetto/configs/trace_config_post_boot.textproto

diff --git a/linux-x86_64/perfetto/configs/trace_config_post_boot.textproto b/linux-x86_64/perfetto/configs/trace_config_post_boot.textproto
index 0cf41fa..449eade 100644
--- a/linux-x86_64/perfetto/configs/trace_config_post_boot.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config_post_boot.textproto
@@ -35,6 +35,27 @@
     }
 }
 data_sources: {
+  config {
+    name: "linux.sys_stats"
+    target_buffer: 1
+    sys_stats_config {
+      meminfo_period_ms: 1000
+      meminfo_counters: MEMINFO_ACTIVE_ANON
+      meminfo_counters: MEMINFO_ACTIVE_FILE
+      meminfo_counters: MEMINFO_INACTIVE_ANON
+      meminfo_counters: MEMINFO_INACTIVE_FILE
+      meminfo_counters: MEMINFO_KERNEL_STACK
+      meminfo_counters: MEMINFO_MLOCKED
+      meminfo_counters: MEMINFO_SHMEM
+      meminfo_counters: MEMINFO_SLAB
+      meminfo_counters: MEMINFO_SLAB_UNRECLAIMABLE
+      meminfo_counters: MEMINFO_VMALLOC_USED
+      meminfo_counters: MEMINFO_MEM_FREE
+      meminfo_counters: MEMINFO_SWAP_FREE
+    }
+  }
+}
+data_sources: {
     config {
         name: "linux.ftrace"
         ftrace_config {