diff options
| -rw-r--r-- | android/allowlists/allowlists.go | 6 | ||||
| -rw-r--r-- | python/bp2build.go | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 100ba99d6..66b806091 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -815,6 +815,8 @@ var ( "chre_flatbuffers", "event_logger", "hal_unit_tests", + + "merge_annotation_zips_test", } Bp2buildModuleTypeAlwaysConvertList = []string{ @@ -838,6 +840,10 @@ var ( // the "prebuilt_" prefix to the name, so that it's differentiable from // the source versions within Soong's module graph. Bp2buildModuleDoNotConvertList = []string{ + // TODO(b/263326760): Failed already. + "minijail_compiler_unittest", + "minijail_parser_unittest", + // Depends on unconverted libandroid, libgui "dvr_buffer_queue-test", "dvr_display-test", diff --git a/python/bp2build.go b/python/bp2build.go index cd3f2a1a8..60cabc410 100644 --- a/python/bp2build.go +++ b/python/bp2build.go @@ -223,7 +223,8 @@ func (p *PythonTestModule) ConvertWithBp2build(ctx android.TopDownMutatorContext props := bazel.BazelTargetModuleProperties{ // Use the native py_binary rule. - Rule_class: "py_test", + Rule_class: "py_test", + Bzl_load_location: "//build/bazel/rules/python:py_test.bzl", } ctx.CreateBazelTargetModule(props, android.CommonAttributes{ |