commit 42aaaaa7c64d8babceb06663b8fc6b1cf3793924
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 15 16:05:14 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 15 16:05:14 2024 +0000
tree ea095345928b6163ab3b6de99228524765c1f3ae
parent 5bb341233d18d8de431d625334aa5569b18fae69
parent d6ac03ff9b62f889b143a691e1a913395db84f87

Merge "heapprofd: Fix outdated log message" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index a0b685c..621eedc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17078,6 +17078,11 @@
     cflags: [
         "-DZLIB_IMPLEMENTATION",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.profiling",
+    ],
+    min_sdk_version: "35",
 }
 
 // GN: //src/traceconv:traceconv

tools/gen_android_bp

diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index f5386dc..71340c9 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -302,6 +302,13 @@
     ],
     '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'
+        }),
+    ],
 }