diff options
| author | 2023-07-26 22:19:09 +0000 | |
|---|---|---|
| committer | 2023-08-01 18:57:59 +0000 | |
| commit | 1aaeea39da72a108f4b0870f95a215fe0c1c77b2 (patch) | |
| tree | 80b36ccba590cd3e9de9758413769ec1bb34d82b | |
| parent | 4b4d61fa2e67ae831428374e1bb2e95d1bdd9a09 (diff) | |
Convert merge_annotation_zips_test to b test
Test: b test //frameworks/base/api:merge_annotation_zips_test
Bug: 293225210
Change-Id: Ia53b4168894b5c70c843ca315d963fa905ef582f
| -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 69bcd2e4b..aaa0aeec4 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -813,6 +813,8 @@ var ( "chre_flatbuffers", "event_logger", "hal_unit_tests", + + "merge_annotation_zips_test", } Bp2buildModuleTypeAlwaysConvertList = []string{ @@ -836,6 +838,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{ |