Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 5b0608c

Browse files
committed
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>
1 parent a2a8259 commit 5b0608c

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

third_party/marl/Android.bp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ cc_library_static {
2020
sdk_version: "27",
2121
srcs: [
2222
"src/debug.cpp",
23+
"src/memory.cpp",
2324
"src/scheduler.cpp",
2425
"src/thread.cpp",
2526
"src/trace.cpp",

third_party/marl/BUILD.gn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ swiftshader_source_set("Marl_headers") {
3131
"include/marl/pool.h",
3232
"include/marl/sal.h",
3333
"include/marl/scheduler.h",
34+
"include/marl/sanitizers.h",
3435
"include/marl/thread.h",
3536
"include/marl/ticket.h",
3637
"include/marl/trace.h",
@@ -46,6 +47,7 @@ swiftshader_source_set("Marl_headers") {
4647
swiftshader_source_set("Marl") {
4748
sources = [
4849
"src/debug.cpp",
50+
"src/memory.cpp",
4951
"src/scheduler.cpp",
5052
"src/thread.cpp",
5153
"src/trace.cpp",

0 commit comments

Comments
 (0)