commit d3052046cbff3a2991bcfa0890e3526afef1b20e
author Jason Macnak <natsu@google.com> Thu Apr 27 17:30:35 2023 +0000
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Apr 28 16:19:07 2023 +0000
tree 736c4c8164e1d7789c2d45979fb2a315a724043e
parent f0d31e0f48466beca805c71d0365d3fe68e17e0e

Fix vulkan.pastel.debug build

... and do not use libswiftshadervk_llvm_debug for
the non-debug vulkan.pastel to correct build errors
found by checkbuild on Android presubmit when adding
host build support.

Bug: b/242184599
Test: Android presubmit on aosp/2566718
Test: m vulkan.pastel
Test: m vulkan.pastel.debug
Change-Id: I14d5d8189a53343c16a670e05b64abfcf5d8bcef
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71588
Presubmit-Ready: Jason Macnak <natsu@google.com>
Tested-by: Jason Macnak <natsu@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Geoff Lang <geofflang@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>

src/Android.bp

diff --git a/src/Android.bp b/src/Android.bp
index b647f2a..023157c 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -68,6 +68,9 @@
     name: "libswiftshadervk_llvm_debug",
     vendor: true,
     defaults: [ "libswiftshadervk_llvm_defaults" ],
+    cflags: [
+        "-UNDEBUG",
+    ],
 }
 
 genrule {
@@ -212,7 +215,7 @@
     name: "vulkan.pastel",
 
     static_libs: [
-        "libswiftshadervk_llvm_debug",
+        "libswiftshadervk_llvm",
         "libLLVM10_swiftshader",
     ],
 

third_party/llvm-10.0/Android.bp

diff --git a/third_party/llvm-10.0/Android.bp b/third_party/llvm-10.0/Android.bp
index 5030e4b..fd3d33a 100644
--- a/third_party/llvm-10.0/Android.bp
+++ b/third_party/llvm-10.0/Android.bp
@@ -1072,6 +1072,8 @@
     defaults: [ "libLLVM10_swiftshader_defaults" ],
 
     srcs: [
+        "llvm/lib/Analysis/RegionPrinter.cpp",
+        "llvm/lib/Analysis/VFABIDemangling.cpp",
         "llvm/lib/MC/MCAsmMacro.cpp",
         "llvm/lib/Support/Locale.cpp",
         "llvm/lib/Support/circular_raw_ostream.cpp",