Merge "Update bp2build tests to use stubbed defs" into main am: e3f7a0d4d6 am: 87a33f30b2 am: c5903904e9 am: b9180401f9 am: 3329ef444b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766386

Change-Id: I03f3e93af06da063c8b7babd973d090aac97fe7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bp2build/aconfig_conversion_test.go

@@ -105,7 +105,6 @@ func TestCcAconfigLibrary(t *testing.T) {
 	cc_library {
 			name: "server_configurable_flags",
 			srcs: ["bar.cc"],
-			bazel_module: { bp2build_available: false },
 	}
 	cc_aconfig_library {
 			name: "foo",
@@ -131,7 +130,8 @@ func TestCcAconfigLibrary(t *testing.T) {
 			},
 		)}
 	RunBp2BuildTestCase(t, registerAconfigModuleTypes, Bp2buildTestCase{
-		Blueprint:            bp,
-		ExpectedBazelTargets: expectedBazelTargets,
+		Blueprint:               bp,
+		ExpectedBazelTargets:    expectedBazelTargets,
+		StubbedBuildDefinitions: []string{"server_configurable_flags"},
 	})
 }

bp2build/cc_library_conversion_test.go

@@ -5161,7 +5161,6 @@ func TestNdkLibraryConversion(t *testing.T) {
 		Blueprint: `
 cc_library {
 	name: "libfoo",
-	bazel_module: { bp2build_available: false },
 }
 ndk_library {
 	name: "libfoo",
@@ -5169,6 +5168,7 @@ ndk_library {
 	symbol_file: "libfoo.map.txt",
 }
 `,
+		StubbedBuildDefinitions: []string{"libfoo"},
 		ExpectedBazelTargets: []string{
 			MakeBazelTarget("cc_stub_suite", "libfoo.ndk_stub_libs", AttrNameToString{
 				"api_surface":          `"publicapi"`,

bp2build/java_test_host_conversion_test.go

@@ -97,14 +97,13 @@ java_test_host {
 
 java_library {
     name: "lib_a",
-    bazel_module: { bp2build_available: false },
 }
 
 java_library {
     name: "static_libs_a",
-    bazel_module: { bp2build_available: false },
 }
 `,
+		StubbedBuildDefinitions: []string{"lib_a", "static_libs_a"},
 		ExpectedBazelTargets: []string{
 			MakeBazelTarget("java_test", "java_test_host-1", AttrNameToString{
 				"runtime_deps": `[