Convert merge_annotation_zips_test to b test
Test: b test //frameworks/base/api:merge_annotation_zips_test
Bug: 293225210
Change-Id: Ia53b4168894b5c70c843ca315d963fa905ef582f
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 69bcd2e..aaa0aee 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -813,6 +813,8 @@
"chre_flatbuffers",
"event_logger",
"hal_unit_tests",
+
+ "merge_annotation_zips_test",
}
Bp2buildModuleTypeAlwaysConvertList = []string{
@@ -836,6 +838,10 @@
// 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 cd3f2a1..60cabc4 100644
--- a/python/bp2build.go
+++ b/python/bp2build.go
@@ -223,7 +223,8 @@
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{