commit e6835570737f373e6c8adf03a57291b4d2cc5ed0
author Jason Macnak <natsu@google.com> Fri Apr 07 16:18:43 2023 +0000
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 25 18:53:47 2023 +0000
tree d1cf7a6f2905d6b8b1a0b26257c4c0897d1c9c7a
parent 23e97b79fb9193bf88e79c16c6a577c680edb2d6

Fix "multiple rules generate <>.o"

... as seen on the Android roll in aosp/2528508.

Bug: b/272710814
Test: cd external/swiftshader
      cherry-pick previous roll attempt aosp/2528508
      mma
Change-Id: Ie3709ce9b1e4dadb06151484d73269a787ccb1b4
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71348
Reviewed-by: Geoff Lang <geofflang@google.com>
Tested-by: Jason Macnak <natsu@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>

third_party/llvm-16.0/Android.bp

diff --git a/third_party/llvm-16.0/Android.bp b/third_party/llvm-16.0/Android.bp
index 8ff2d34..7821fd2 100644
--- a/third_party/llvm-16.0/Android.bp
+++ b/third_party/llvm-16.0/Android.bp
@@ -1428,12 +1428,6 @@
 
     defaults: [ "libLLVM16_swiftshader_defaults" ],
 
-    srcs: [
-        "llvm/lib/MC/MCAsmMacro.cpp",
-        "llvm/lib/Support/Locale.cpp",
-        "llvm/lib/Support/circular_raw_ostream.cpp",
-    ],
-
     cflags: [
         "-UNDEBUG",
     ],

third_party/llvm-16.0/scripts/template_Android.bp

diff --git a/third_party/llvm-16.0/scripts/template_Android.bp b/third_party/llvm-16.0/scripts/template_Android.bp
index 9d15ee3..e33809b 100644
--- a/third_party/llvm-16.0/scripts/template_Android.bp
+++ b/third_party/llvm-16.0/scripts/template_Android.bp
@@ -94,12 +94,6 @@
 
     defaults: [ "libLLVM16_swiftshader_defaults" ],
 
-    srcs: [
-        "llvm/lib/MC/MCAsmMacro.cpp",
-        "llvm/lib/Support/Locale.cpp",
-        "llvm/lib/Support/circular_raw_ostream.cpp",
-    ],
-
     cflags: [
         "-UNDEBUG",
     ],