From 54abd2e128f696c5efa6db2b63104e59074e269d Mon Sep 17 00:00:00 2001
From: Trevor Radcliffe <tradical@google.com>
Date: Tue, 19 Apr 2022 14:50:39 +0000
Subject: [PATCH] Fix tests for cc_prebuilt_library bp2build

Also, add the tests to Soong

Bug: 225938765
Test: ran tests
Change-Id: Ia26e46d89b8a408eb4b09f93a7ed4f0aa2e37809
---
 bp2build/Android.bp                             | 2 ++
 bp2build/cc_prebuilt_library_conversion_test.go | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bp2build/Android.bp b/bp2build/Android.bp
index 8f78968e4..e0ce19477 100644
--- a/bp2build/Android.bp
+++ b/bp2build/Android.bp
@@ -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",
diff --git a/bp2build/cc_prebuilt_library_conversion_test.go b/bp2build/cc_prebuilt_library_conversion_test.go
index 818331634..3cf896903 100644
--- a/bp2build/cc_prebuilt_library_conversion_test.go
+++ b/bp2build/cc_prebuilt_library_conversion_test.go
@@ -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"),
 		})
 }