From 9e8a995fce992a97a0d287cc3797b884a6be42d4 Mon Sep 17 00:00:00 2001
From: Lalit Maganti <lalitm@google.com>
Date: Mon, 9 Sep 2024 11:52:56 +0100
Subject: [PATCH] perfetto: autogenerate one more target it's easy to do so

Change-Id: I855ab4fa1f92cf43ca3631e57a1da6c3eec2c0ab
---
 Android.bp           | 79 ++++++++++++++++++++++++++++++++++++--------
 Android.bp.extras    | 14 --------
 tools/gen_android_bp |  2 +-
 3 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/Android.bp b/Android.bp
index b60520fa00..b68991908c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1382,6 +1382,71 @@ filegroup {
     ],
 }
 
+// GN: [//protos/perfetto/config:source_set]
+java_library {
+    name: "perfetto_config_java_protos",
+    srcs: [
+        "protos/perfetto/common/android_energy_consumer_descriptor.proto",
+        "protos/perfetto/common/android_log_constants.proto",
+        "protos/perfetto/common/builtin_clock.proto",
+        "protos/perfetto/common/commit_data_request.proto",
+        "protos/perfetto/common/data_source_descriptor.proto",
+        "protos/perfetto/common/descriptor.proto",
+        "protos/perfetto/common/ftrace_descriptor.proto",
+        "protos/perfetto/common/gpu_counter_descriptor.proto",
+        "protos/perfetto/common/interceptor_descriptor.proto",
+        "protos/perfetto/common/observable_events.proto",
+        "protos/perfetto/common/perf_events.proto",
+        "protos/perfetto/common/protolog_common.proto",
+        "protos/perfetto/common/sys_stats_counters.proto",
+        "protos/perfetto/common/trace_stats.proto",
+        "protos/perfetto/common/tracing_service_capabilities.proto",
+        "protos/perfetto/common/tracing_service_state.proto",
+        "protos/perfetto/common/track_event_descriptor.proto",
+        "protos/perfetto/config/android/android_game_intervention_list_config.proto",
+        "protos/perfetto/config/android/android_input_event_config.proto",
+        "protos/perfetto/config/android/android_log_config.proto",
+        "protos/perfetto/config/android/android_polled_state_config.proto",
+        "protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto",
+        "protos/perfetto/config/android/android_system_property_config.proto",
+        "protos/perfetto/config/android/network_trace_config.proto",
+        "protos/perfetto/config/android/packages_list_config.proto",
+        "protos/perfetto/config/android/pixel_modem_config.proto",
+        "protos/perfetto/config/android/protolog_config.proto",
+        "protos/perfetto/config/android/surfaceflinger_layers_config.proto",
+        "protos/perfetto/config/android/surfaceflinger_transactions_config.proto",
+        "protos/perfetto/config/android/windowmanager_config.proto",
+        "protos/perfetto/config/chrome/chrome_config.proto",
+        "protos/perfetto/config/chrome/scenario_config.proto",
+        "protos/perfetto/config/chrome/v8_config.proto",
+        "protos/perfetto/config/data_source_config.proto",
+        "protos/perfetto/config/etw/etw_config.proto",
+        "protos/perfetto/config/ftrace/ftrace_config.proto",
+        "protos/perfetto/config/gpu/gpu_counter_config.proto",
+        "protos/perfetto/config/gpu/vulkan_memory_config.proto",
+        "protos/perfetto/config/inode_file/inode_file_config.proto",
+        "protos/perfetto/config/interceptor_config.proto",
+        "protos/perfetto/config/interceptors/console_config.proto",
+        "protos/perfetto/config/power/android_power_config.proto",
+        "protos/perfetto/config/process_stats/process_stats_config.proto",
+        "protos/perfetto/config/profiling/heapprofd_config.proto",
+        "protos/perfetto/config/profiling/java_hprof_config.proto",
+        "protos/perfetto/config/profiling/perf_event_config.proto",
+        "protos/perfetto/config/statsd/atom_ids.proto",
+        "protos/perfetto/config/statsd/statsd_tracing_config.proto",
+        "protos/perfetto/config/stress_test_config.proto",
+        "protos/perfetto/config/sys_stats/sys_stats_config.proto",
+        "protos/perfetto/config/system_info/system_info.proto",
+        "protos/perfetto/config/test_config.proto",
+        "protos/perfetto/config/trace_config.proto",
+        "protos/perfetto/config/track_event/track_event_config.proto",
+    ],
+    proto: {
+        type: "lite",
+        canonical_path_from_root: false,
+    },
+}
+
 // GN: //test/cts:perfetto_cts_deps
 cc_library_static {
     name: "perfetto_cts_deps",
@@ -17786,20 +17851,6 @@ java_library {
     ],
 }
 
-java_library {
-    name: "perfetto_config_java_protos",
-    srcs: [
-        ":perfetto_config_filegroup_proto",
-    ],
-    static_libs: [
-        "libprotobuf-java-lite",
-    ],
-    proto: {
-        type: "lite",
-        canonical_path_from_root: false,
-    },
-}
-
 java_library {
     name: "perfetto_config_java_protos_system_server_current",
     srcs: [
diff --git a/Android.bp.extras b/Android.bp.extras
index 44eeab4790..75f8b32fbb 100644
--- a/Android.bp.extras
+++ b/Android.bp.extras
@@ -214,20 +214,6 @@ java_library {
     ],
 }
 
-java_library {
-    name: "perfetto_config_java_protos",
-    srcs: [
-        ":perfetto_config_filegroup_proto",
-    ],
-    static_libs: [
-        "libprotobuf-java-lite",
-    ],
-    proto: {
-        type: "lite",
-        canonical_path_from_root: false,
-    },
-}
-
 java_library {
     name: "perfetto_config_java_protos_system_server_current",
     srcs: [
diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index 2b272eaa2c..8041e293de 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -139,7 +139,7 @@ proto_groups = {
         ]
     },
     'config': {
-        'types': ['filegroup'],
+        'types': ['lite', 'filegroup'],
         'targets': [
             '//protos/perfetto/config:source_set',
         ]