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: [
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",
+    ],
+}