commit e693b62e6baebe8d909a69ab530ea7732f62f821
author Ben Clayton <bclayton@google.com> Thu Sep 05 12:48:37 2019 +0100
committer Ben Clayton <bclayton@google.com> Sat Sep 07 11:49:25 2019 +0000
tree e77f141ef424a4f4ffc74427e6acd7d942f0c57b
parent b6c572d0b1114e0159d742e8d89bc3609cf59bef

Migrate from yarn to marl.

Bug: b/140546382
Change-Id: I106cde639419fb49d5d161555f1baa687bb12e91
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/36111
Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

src/Android.bp

diff --git a/src/Android.bp b/src/Android.bp
index 88d2a6f..b74589b 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -492,31 +492,6 @@
     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",
-    ],
-}
-
 
 // Vulkan
 
@@ -592,6 +567,7 @@
     ],
 
     static_libs: [
+        "swiftshader_marl",
         "swiftshader_spirv-tools",
     ],
 
@@ -607,7 +583,6 @@
     static_libs: [
         "libswiftshadervk_llvm_debug",
         "libLLVM7_swiftshader",
-        "libyarn",
     ],
 
     defaults: [
@@ -622,7 +597,6 @@
     static_libs: [
         "libswiftshadervk_llvm_debug",
         "libLLVM7_swiftshader",
-        "libyarn",
     ],
 
     cflags: [