AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fuchsia] Always use full name of FIDL libraries.

Browse Source 
Previously we assumed that FIDL libraries always have
"fuchsia.*" prefix, however the "zx" library recently
added to SDK doesn't start with this prefix and caused
build failure. This change fixes the issue by always
using full name of all the FIDL libraries.

TEST=build Skia and SkQP for fuchsia.x64 and arm64.

Change-Id: I1643bba94263d285eb9dbc222667b884cad6610d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295409
Auto-Submit: Yilong Li <liyl@google.com>
Commit-Queue: John Rosasco <rosasco@google.com>
Reviewed-by: John Rosasco <rosasco@google.com>
This commit is contained in:
Yilong Li 2020-06-09 15:34:46 -07:00 committed by Skia Commit-Bot
parent 392fa03a1b
commit 437c78593c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/fuchsia/sdk.gni
View File

@ -74,7 +74,7 @@ template("_fuchsia_fidl_library") {
_deps = [ "../pkg:fidl_cpp" ]
library_name = string_replace(meta_json.name, "fuchsia.", "")
library_name = meta_json.name
library_name_json = "$library_name.json"
foreach(dep, meta_json.deps) {
@ -95,9 +95,9 @@ template("_fuchsia_fidl_library") {
inputs = [ invoker.meta ]
outputs = [
"$target_gen_dir/fuchsia/$library_name_slashes/c/tables.c",
"$target_gen_dir/fuchsia/$library_name_slashes/cpp/fidl.h",
"$target_gen_dir/fuchsia/$library_name_slashes/cpp/fidl.cc",
"$target_gen_dir/$library_name_slashes/c/tables.c",
"$target_gen_dir/$library_name_slashes/cpp/fidl.h",
"$target_gen_dir/$library_name_slashes/cpp/fidl.cc",
]
args = [
@ -114,9 +114,9 @@ template("_fuchsia_fidl_library") {
"--include-base",
rebase_path("$target_gen_dir"),
"--output-base-cc",
rebase_path("$target_gen_dir/fuchsia/$library_name_slashes/cpp/fidl"),
rebase_path("$target_gen_dir/$library_name_slashes/cpp/fidl"),
"--output-c-tables",
rebase_path("$target_gen_dir/fuchsia/$library_name_slashes/c/tables.c"),
rebase_path("$target_gen_dir/$library_name_slashes/c/tables.c"),
]
}