From 1554c9d0f133c2b8e33c664be5dac760c6670e83 Mon Sep 17 00:00:00 2001 From: Yisroel Forta Date: Fri, 15 Nov 2024 11:39:33 +0000 Subject: [PATCH] Modify trace redactor target to be included in module apex Trace redactor needs to live in the apex so that it can be updated with it. As a first step, prepare the target by: - Adding apex available - Setting a min sdk to match the apex Test: presubmit, tested with future changes to make sure it can be added to apex Bug: 379255273 Flag: EXEMPT - infeasible Change-Id: Ie178f89a5dc69585b01095f553cebca78605f3a8 --- Android.bp | 5 +++++ tools/gen_android_bp | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/Android.bp b/Android.bp index a0b685c008..621eedc9e1 100644 --- 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 index f5386dc16b..71340c921e 100755 --- 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' + }), + ], }