Commit ae0f7506 by Chris Forbes Committed by Ben Clayton

Add libyarn static library to Android build

- Had to rename .c of .c/.s pair to avoid Android's build system producing name clashes - Rename .s to .S to get assembler-with-cpp behavior Bug: b/139010488 Change-Id: Ib5ee9355e60fe52b1caedfc6ec1b456296d519f5 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35188Tested-by: 's avatarBen Clayton <bclayton@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarBen Clayton <bclayton@google.com>
parent 75b6f212
...@@ -1768,7 +1768,7 @@ if(BUILD_YARN) ...@@ -1768,7 +1768,7 @@ if(BUILD_YARN)
) )
if (NOT MSVC) if (NOT MSVC)
file(GLOB YARN_ASSEMBLY_LIST ${YARN_DIR}/*.s) file(GLOB YARN_ASSEMBLY_LIST ${YARN_DIR}/*.S)
list(APPEND YARN_FULL_LIST ${YARN_ASSEMBLY_LIST}) list(APPEND YARN_FULL_LIST ${YARN_ASSEMBLY_LIST})
endif(NOT MSVC) endif(NOT MSVC)
......
...@@ -579,6 +579,34 @@ cc_library_shared { ...@@ -579,6 +579,34 @@ cc_library_shared {
static_libs: [ "libswiftshader_compiler_debug" ], static_libs: [ "libswiftshader_compiler_debug" ],
} }
// Yarn, fibers + scheduler library
cc_library_static {
name: "libyarn",
vendor: true,
srcs: [
"Yarn/Debug.cpp",
"Yarn/Scheduler.cpp",
"Yarn/Thread.cpp",
"Yarn/Trace.cpp",
],
arch: {
arm: { srcs: ["Yarn/OSFiber_arm.c", "Yarn/OSFiber_asm_arm.S"], },
arm64: { srcs: ["Yarn/OSFiber_aarch64.c", "Yarn/OSFiber_asm_aarch64.S"], },
x86: { srcs: ["Yarn/OSFiber_x86.c", "Yarn/OSFiber_asm_x86.S"], },
x86_64: { srcs: ["Yarn/OSFiber_x64.c", "Yarn/OSFiber_asm_x64.S"], },
},
cflags: [
"-Wno-unused-parameter",
],
asflags: [
"-DBUILD_ASM",
],
}
// Vulkan // Vulkan
...@@ -673,6 +701,7 @@ cc_library_shared { ...@@ -673,6 +701,7 @@ cc_library_shared {
static_libs: [ static_libs: [
"libswiftshadervk_llvm_debug", "libswiftshadervk_llvm_debug",
"libLLVM7_swiftshader", "libLLVM7_swiftshader",
"libyarn",
], ],
host_supported: false, host_supported: false,
...@@ -689,6 +718,7 @@ cc_library_shared { ...@@ -689,6 +718,7 @@ cc_library_shared {
static_libs: [ static_libs: [
"libswiftshadervk_llvm_debug", "libswiftshadervk_llvm_debug",
"libLLVM7_swiftshader", "libLLVM7_swiftshader",
"libyarn",
], ],
host_supported: false, host_supported: false,
......
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