commit 5554b0e2768fb17dc4e18a4ac203dc8ca7f3148d
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 10 02:46:52 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 10 02:46:52 2022 +0000
tree 5eadc87758fc01fe1f1d322654b83a179b3ee5c1
parent 979ef5bb2a728f681522744739f5cd12fc86cc95
parent 7a2a9967b1fee88143ee826ef1478cec173a8f41

Merge "Reland "Update to clang-r450784e""

cc/Android.bp

diff --git a/cc/Android.bp b/cc/Android.bp
index 60d329e..ce94467 100644
--- a/cc/Android.bp
+++ b/cc/Android.bp
@@ -91,6 +91,7 @@
     ],
     testSrcs: [
         "afdo_test.go",
+        "binary_test.go",
         "cc_test.go",
         "compiler_test.go",
         "gen_test.go",

cc/binary_test.go

diff --git a/cc/binary_test.go b/cc/binary_test.go
index 1b8b4a8..cba5974 100644
--- a/cc/binary_test.go
+++ b/cc/binary_test.go
@@ -65,7 +65,7 @@
 	android.AssertStringListContains(t, "missing dependency on linker_scripts",
 		binFoo.Implicits.Strings(), "bar.ld")
 	android.AssertStringDoesContain(t, "missing flag for linker_scripts",
-		libfoo.Args["ldFlags"], "-Wl,--script,foo.ld")
+		binFoo.Args["ldFlags"], "-Wl,--script,foo.ld")
 	android.AssertStringDoesContain(t, "missing flag for linker_scripts",
-		libfoo.Args["ldFlags"], "-Wl,--script,bar.ld")
+		binFoo.Args["ldFlags"], "-Wl,--script,bar.ld")
 }