Skip to content

S
swiftshader
Commit fefd0854 by Jason Macnak
Options

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: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarJason Macnak <natsu@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com>
parent 6c839a60
Showing with 26 additions and 4 deletions
src/Android.bp
...@@ -366,7 +366,7 @@ cc_defaults { ...@@ -366,7 +366,7 @@ cc_defaults {
defaults: [ "libswiftshader_debug" ], defaults: [ "libswiftshader_debug" ],
static_libs: [ static_libs: [
"libswiftshader_llvm_debug", "libswiftshader_llvm_debug",
"libLLVM10_swiftshader", "libLLVM10_swiftshader_debug",
], ],
} }
...@@ -684,7 +684,7 @@ cc_library_shared { ...@@ -684,7 +684,7 @@ cc_library_shared {
static_libs: [ static_libs: [
"libswiftshadervk_llvm_debug", "libswiftshadervk_llvm_debug",
"libLLVM10_swiftshader", "libLLVM10_swiftshader_debug",
], ],
cflags: [ cflags: [
......
third_party/llvm-10.0/Android.bp
cc_defaults {
name: "libLLVM10_swiftshader_defaults",
cc_library_static {
name: "libLLVM10_swiftshader",
device_supported: true, device_supported: true,
host_supported: true, host_supported: true,
vendor: true, vendor: true,
...@@ -1028,3 +1028,25 @@ cc_library_static { ...@@ -1028,3 +1028,25 @@ cc_library_static {
"-Wno-unused-parameter", "-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",
],
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment