commit 5b0608c1769b754ee2abc89f5f823bb60a9fef4b
author Ben Clayton <bclayton@google.com> Sat Oct 05 08:44:30 2019 +0100
committer Ben Clayton <bclayton@google.com> Sat Oct 05 08:33:41 2019 +0000
tree 851bbd05f926ac35b8f1145a76840de16549134f
parent a2a8259c2b28a6b7d0e05b66a3fd775ba2d6d966

third_party/marl: Add new source files to BUILD.gn and Android.bp

These build files are not upstreamed to the marl repo as they use SwiftShader specifics.
This means the file sets need to be updated whenever marl is updated.

Bug: b/140546382
Change-Id: I18181d95d2c8162525afc4fe7d49106bc2186562
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/37130
Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

third_party/marl/Android.bp

diff --git a/third_party/marl/Android.bp b/third_party/marl/Android.bp
index 52e1b4f..9f45246 100644
--- a/third_party/marl/Android.bp
+++ b/third_party/marl/Android.bp
@@ -20,6 +20,7 @@
     sdk_version: "27",
     srcs: [
         "src/debug.cpp",
+        "src/memory.cpp",
         "src/scheduler.cpp",
         "src/thread.cpp",
         "src/trace.cpp",

third_party/marl/BUILD.gn

diff --git a/third_party/marl/BUILD.gn b/third_party/marl/BUILD.gn
index 58821fe..c1fcb1b 100644
--- a/third_party/marl/BUILD.gn
+++ b/third_party/marl/BUILD.gn
@@ -31,6 +31,7 @@
     "include/marl/pool.h",
     "include/marl/sal.h",
     "include/marl/scheduler.h",
+    "include/marl/sanitizers.h",
     "include/marl/thread.h",
     "include/marl/ticket.h",
     "include/marl/trace.h",
@@ -46,6 +47,7 @@
 swiftshader_source_set("Marl") {
   sources = [
     "src/debug.cpp",
+    "src/memory.cpp",
     "src/scheduler.cpp",
     "src/thread.cpp",
     "src/trace.cpp",