Skip to content

S
swiftshader
Commit e06125cb by Antonio Maiorano
Options

Fix Chromium and Android build

I broke this when I removed the relative path to the third_party astc include file in this change: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43269 Bug: none Change-Id: I45de8a6159c69c893df4449f6c6e10b09a9e6fe4 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43448Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent 030aae05
Showing with 7 additions and 2 deletions
src/Device/BUILD.gn
...@@ -50,6 +50,7 @@ swiftshader_source_set("Device") { ...@@ -50,6 +50,7 @@ swiftshader_source_set("Device") {
"Renderer.cpp", "Renderer.cpp",
"SetupProcessor.cpp", "SetupProcessor.cpp",
"VertexProcessor.cpp", "VertexProcessor.cpp",
# TODO: Write Build.gn for third_party/astc-encoder
"../../third_party/astc-encoder/Source/astc_block_sizes2.cpp", "../../third_party/astc-encoder/Source/astc_block_sizes2.cpp",
"../../third_party/astc-encoder/Source/astc_color_unquantize.cpp", "../../third_party/astc-encoder/Source/astc_color_unquantize.cpp",
"../../third_party/astc-encoder/Source/astc_decompress_symbolic.cpp", "../../third_party/astc-encoder/Source/astc_decompress_symbolic.cpp",
...@@ -68,6 +69,7 @@ swiftshader_source_set("Device") { ...@@ -68,6 +69,7 @@ swiftshader_source_set("Device") {
"..", "..",
"../../include", "../../include",
"../../third_party/SPIRV-Headers/include", "../../third_party/SPIRV-Headers/include",
"../../third_party/astc-encoder/Source"
] ]
defines = [ defines = [
......
third_party/astc-encoder/Android.bp
...@@ -31,7 +31,11 @@ cc_library_static { ...@@ -31,7 +31,11 @@ cc_library_static {
"Source", "Source",
], ],
export_include_dirs: [
"Source",
]
static_libs: [ static_libs: [
"swiftshader_debug", "swiftshader_debug",
] ]
} }
\ No newline at end of file
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