From 3e2da94e2d7e0e192f73659c9e0ad9d6066171ea Mon Sep 17 00:00:00 2001 From: Kevin Dagostino Date: Sun, 20 Nov 2022 07:16:47 +0000 Subject: [PATCH] Use existing BUILD files for test-related tools. Allowlist BUILD files of test-related tools so that they appear in the final bp2build workspace. This is required for Bazel test rules that are dependent on these projects. Test: b build //prebuilts/runtime/... //tools/asuite/atest:atest-tradefed //tools/asuite/atest/bazel/reporter/... Change-Id: Ie34658706efe6ca7657c935528df8daef61bfc0c --- android/allowlists/allowlists.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 0718da30f..9d3ecdab4 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -385,8 +385,11 @@ var ( "prebuilts/sdk":/* recursive = */ false, "prebuilts/sdk/tools":/* recursive = */ false, "prebuilts/r8":/* recursive = */ false, + "prebuilts/runtime":/* recursive = */ false, - "tools/asuite/atest/":/* recursive = */ true, + // not recursive due to conflicting workspace paths in tools/atest/bazel/rules + "tools/asuite/atest":/* recursive = */ false, + "tools/asuite/atest/bazel/reporter":/* recursive = */ true, } Bp2buildModuleAlwaysConvertList = []string{