commit 38d962500b07afd0a16cbce61a869401dd23c088
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 22 16:59:27 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 22 16:59:27 2024 +0000
tree d52c5ca3e4ef08ac0c271d893f9589cbb44a8a0c
parent 80aa7fb27ee21d81c9f20058f11665bf0830725a
parent 56f45027fe07475a7120ec39b7951de032c3f8fb

Merge "Explicitly install optional components of perfetto" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index 1a7fd1d..d5da1dd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15548,12 +15548,6 @@
     defaults: [
         "perfetto_defaults",
     ],
-    required: [
-        "libperfetto_android_internal",
-        "mm_events",
-        "traced_perf",
-        "trigger_perfetto",
-    ],
     target: {
         android: {
             shared_libs: [
@@ -15921,3 +15915,13 @@
     sub_dir: "perfetto",
     src: "persistent_cfg.pbtxt",
 }
+
+phony {
+    name: "perfetto-extras",
+    required: [
+        "libperfetto_android_internal",
+        "mm_events",
+        "traced_perf",
+        "trigger_perfetto",
+    ],
+}

Android.bp.extras

diff --git a/Android.bp.extras b/Android.bp.extras
index 2ce8e95..3aab5af 100644
--- a/Android.bp.extras
+++ b/Android.bp.extras
@@ -205,3 +205,13 @@
     sub_dir: "perfetto",
     src: "persistent_cfg.pbtxt",
 }
+
+phony {
+    name: "perfetto-extras",
+    required: [
+        "libperfetto_android_internal",
+        "mm_events",
+        "traced_perf",
+        "trigger_perfetto",
+    ],
+}

tools/gen_android_bp

diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index 561657d..ba5320c 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -245,10 +245,6 @@
         ('test_suites', {'general-tests'}),
         ('test_config', 'PerfettoIntegrationTests.xml'),
     ],
-    'traced_probes': [('required', {
-        'libperfetto_android_internal', 'trigger_perfetto', 'traced_perf',
-        'mm_events'
-    }),],
     'libperfetto_android_internal': [('static_libs', {'libhealthhalutils'}),],
     'trace_processor_shell': [
         ('strip', {