StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert merge_annotation_zips_test to b test

Browse Source 
Test: b test //frameworks/base/api:merge_annotation_zips_test
Bug: 293225210
Change-Id: Ia53b4168894b5c70c843ca315d963fa905ef582f
This commit is contained in:
yike
2023-07-26 22:19:09 +00:00
parent 4b4d61fa2e
commit 1aaeea39da
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/allowlists/allowlists.go
View File

@@ -813,6 +813,8 @@ var (
"chre_flatbuffers", "chre_flatbuffers",
"event_logger", "event_logger",
"hal_unit_tests", "hal_unit_tests",
"merge_annotation_zips_test",
} }
Bp2buildModuleTypeAlwaysConvertList = []string{ Bp2buildModuleTypeAlwaysConvertList = []string{
@@ -836,6 +838,10 @@ var (
// the "prebuilt_" prefix to the name, so that it's differentiable from // the "prebuilt_" prefix to the name, so that it's differentiable from
// the source versions within Soong's module graph. // the source versions within Soong's module graph.
Bp2buildModuleDoNotConvertList = []string{ Bp2buildModuleDoNotConvertList = []string{
// TODO(b/263326760): Failed already.
"minijail_compiler_unittest",
"minijail_parser_unittest",
// Depends on unconverted libandroid, libgui // Depends on unconverted libandroid, libgui
"dvr_buffer_queue-test", "dvr_buffer_queue-test",
"dvr_display-test", "dvr_display-test",

1
python/bp2build.go
View File

@@ -224,6 +224,7 @@ func (p *PythonTestModule) ConvertWithBp2build(ctx android.TopDownMutatorContext
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
// Use the native py_binary rule. // 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{ ctx.CreateBazelTargetModule(props, android.CommonAttributes{