commit fefd0854a0383fdc7fd7c3a50d37fcb56e618dc2
author Jason Macnak <natsu@google.com> Tue Nov 10 09:29:03 2020 -0800
committer Jason Macnak <natsu@google.com> Wed Nov 11 15:11:33 2020 +0000
tree 9df2d6e94c08020082474fa723e0026fd67328af
parent 6c839a60adb70289afb3a2c3b30bb2e4dce38a8a

Fix Android build

... to support a fresh merge into AOSP including
https://swiftshader-review.googlesource.com/c/SwiftShader/+/49688
to unblock ANGLE CI.

Introduces a libLLVM10_swiftshader_debug to handle
linker errors around LLVMJIT_ORCv1.cpp including
llvm/Support/Error.h and whether or not
LLVM_ENABLE_ABI_BREAKING_CHECKS is defined.

Bug: b/147316305
Test: TreeHugger build on aosp/1494218
Change-Id: I513cb76f03f49699e4a0e8b0c7d3e59a2baa3a86
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/50148
Presubmit-Ready: Jason Macnak <natsu@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Jason Macnak <natsu@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>

src/Android.bp

diff --git a/src/Android.bp b/src/Android.bp
index f8b22ad..87b939a 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -366,7 +366,7 @@
     defaults: [ "libswiftshader_debug" ],
     static_libs: [
         "libswiftshader_llvm_debug",
-        "libLLVM10_swiftshader",
+        "libLLVM10_swiftshader_debug",
     ],
 }
 
@@ -684,7 +684,7 @@
 
     static_libs: [
         "libswiftshadervk_llvm_debug",
-        "libLLVM10_swiftshader",
+        "libLLVM10_swiftshader_debug",
     ],
 
     cflags: [

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 bb262a6..a44b752 100644
--- a/third_party/llvm-10.0/Android.bp
+++ b/third_party/llvm-10.0/Android.bp
@@ -1,6 +1,6 @@
+cc_defaults {
+    name: "libLLVM10_swiftshader_defaults",
 
-cc_library_static {
-    name: "libLLVM10_swiftshader",
     device_supported: true,
     host_supported: true,
     vendor: true,
@@ -1028,3 +1028,25 @@
         "-Wno-unused-parameter",
     ],
 }
+
+cc_library_static {
+    name: "libLLVM10_swiftshader",
+
+    defaults: [ "libLLVM10_swiftshader_defaults" ],
+}
+
+cc_library_static {
+    name: "libLLVM10_swiftshader_debug",
+
+    defaults: [ "libLLVM10_swiftshader_defaults" ],
+
+    srcs: [
+        "llvm/lib/MC/MCAsmMacro.cpp",
+        "llvm/lib/Support/Locale.cpp",
+        "llvm/lib/Support/circular_raw_ostream.cpp",
+    ],
+
+    cflags: [
+        "-UNDEBUG",
+    ],
+}