Refactor bp2build tests for allowlist v2
Allowlist v2 will change bp2build by automatically disabling rdeps of
unconvertible modules. Many bp2build tests create bp2build stub modules
without an implementation,
This CL changes setup of such tests to also contain a BUILD file with
"stub implementations" of equivalent targets, to keep these test targets
convertible.
To verify this change in-place, this CL removes `bp2build_available:
false` from these dependencies.
This is a test-only change for bp2build tests.
Bug: 285631638
Test: m bp2build
Change-Id: I489480cbc4158a416b7abf57c35a6e2bc2ad6173
diff --git a/bp2build/aar_conversion_test.go b/bp2build/aar_conversion_test.go
index ce20721..59aacbb 100644
--- a/bp2build/aar_conversion_test.go
+++ b/bp2build/aar_conversion_test.go
@@ -15,10 +15,10 @@
package bp2build
import (
+ "testing"
+
"android/soong/android"
"android/soong/java"
-
- "testing"
)
func TestConvertAndroidLibrary(t *testing.T) {
@@ -34,7 +34,8 @@
"res/res.png": "",
"manifest/AndroidManifest.xml": "",
},
- Blueprint: SimpleModuleDoNotConvertBp2build("android_library", "static_lib_dep") + `
+ StubbedBuildDefinitions: []string{"static_lib_dep"},
+ Blueprint: simpleModule("android_library", "static_lib_dep") + `
android_library {
name: "TestLib",
srcs: ["lib.java"],
@@ -81,7 +82,7 @@
"res/res.png": "",
"AndroidManifest.xml": "",
},
- Blueprint: SimpleModuleDoNotConvertBp2build("android_library", "lib_dep") + `
+ Blueprint: simpleModule("android_library", "lib_dep") + `
android_library {
name: "TestLib",
srcs: [],
@@ -107,18 +108,24 @@
ModuleTypeUnderTestFactory: java.AARImportFactory,
Filesystem: map[string]string{
"import.aar": "",
+ "dep.aar": "",
},
+ StubbedBuildDefinitions: []string{"static_lib_dep", "prebuilt_static_import_dep"},
// Bazel's aar_import can only export *_import targets, so we expect
// only "static_import_dep" in exports, but both "static_lib_dep" and
// "static_import_dep" in deps
- Blueprint: SimpleModuleDoNotConvertBp2build("android_library", "static_lib_dep") +
- SimpleModuleDoNotConvertBp2build("android_library_import", "static_import_dep") + `
+ Blueprint: simpleModule("android_library", "static_lib_dep") + `
android_library_import {
name: "TestImport",
aars: ["import.aar"],
static_libs: ["static_lib_dep", "static_import_dep"],
sdk_version: "current",
}
+
+// TODO: b/301007952 - This dep is needed because android_library_import must have aars set.
+android_library_import {
+ name: "static_import_dep",
+}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget(