Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54abd2e1 authored Apr 19, 2022 by Trevor Radcliffe

Fix tests for cc_prebuilt_library bp2build

Also, add the tests to Soong

Bug: 225938765
Test: ran tests
Change-Id: Ia26e46d89b8a408eb4b09f93a7ed4f0aa2e37809

parent e273af21

bp2build/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,7 +45,9 @@ bootstrap_go_package {
		"cc_library_shared_conversion_test.go",
		"cc_library_static_conversion_test.go",
		"cc_object_conversion_test.go",
		"cc_prebuilt_library_conversion_test.go",
		"cc_prebuilt_library_shared_test.go",
		"cc_prebuilt_library_static_test.go",
		"conversion_test.go",
		"filegroup_conversion_test.go",
		"genrule_conversion_test.go",

bp2build/cc_prebuilt_library_conversion_test.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ cc_prebuilt_library {
		},
		bazel_module: { bp2build_available: true },
		}`,
		expectedErr: fmt.Errorf("Expected at most once source file"),
		expectedErr: fmt.Errorf("Expected at most one source file"),
		})
		}

		@@ -159,7 +159,7 @@ cc_prebuilt_library {
		},
		bazel_module: { bp2build_available: true },
		}`,
		expectedErr: fmt.Errorf("Expected at most once source file"),
		expectedErr: fmt.Errorf("Expected at most one source file"),
		})
		}