Add bpf_test.go to build and fix the tests

bpf_test.go was not listed in testSrcs, which meant it was not run
during the build, but ran and failed with go test android/soong/...

Test: m
Test: go test android/soong/...
Change-Id: I4542640e8ff08e71565ed50617dbe67d86b29b69

2 files changed, 11 insertions, 0 deletions

diff --git a/bpf/Android.bp b/bpf/Android.bp
index 7bd4d443..882cd8af 100644
--- a/bpf/Android.bp
+++ b/bpf/Android.bp
@@ -21,10 +21,14 @@ bootstrap_go_package {
         "blueprint",
         "blueprint-proptools",
         "soong-android",
+        "soong-cc",
         "soong-cc-config",
     ],
     srcs: [
         "bpf.go",
     ],
+    testSrcs: [
+        "bpf_test.go",
+    ],
     pluginFor: ["soong_build"],
 }
diff --git a/bpf/bpf_test.go b/bpf/bpf_test.go
index 1d53e413..2f492748 100644
--- a/bpf/bpf_test.go
+++ b/bpf/bpf_test.go
@@ -91,6 +91,13 @@ func testContext(bp string) *android.TestContext {
                         src: "",
                 }
 
+                toolchain_library {
+                        name: "libgcc_stripped",
+                        vendor_available: true,
+                        recovery_available: true,
+                        src: "",
+                }
+
                 cc_library {
                         name: "libc",
                         no_libgcc: true,