Merge "Modify trace redactor target to be included in module apex" in…

…to main
google · Nov 15, 2024 · 5bb3412 · 5bb3412
2 parents 0fd224e + 1554c9d
commit 5bb3412
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Android.bp b/Android.bp
@@ -17078,6 +17078,11 @@ cc_binary {
     cflags: [
         "-DZLIB_IMPLEMENTATION",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.profiling",
+    ],
+    min_sdk_version: "35",
 }
 
 // GN: //src/traceconv:traceconv

diff --git a/tools/gen_android_bp b/tools/gen_android_bp
@@ -302,6 +302,13 @@ additional_args = {
     ],
     'libperfetto': [('export_include_dirs', {'include', buildflags_dir}),],
     'perfetto': [('required', {'perfetto_persistent_cfg.pbtxt'}),],
+    'trace_redactor': [
+        ('min_sdk_version', '35'),
+        ('apex_available', {
+            '//apex_available:platform',
+            'com.android.profiling'
+        }),
+    ],
 }