diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/third_party/skia/build/fuchsia | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/skia/build/fuchsia')
| -rwxr-xr-x | chromium/third_party/skia/build/fuchsia/fidl_gen_cpp | 3 | ||||
| -rw-r--r-- | chromium/third_party/skia/build/fuchsia/sdk.gni | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/chromium/third_party/skia/build/fuchsia/fidl_gen_cpp b/chromium/third_party/skia/build/fuchsia/fidl_gen_cpp index 6d2c10de970..0b47297c179 100755 --- a/chromium/third_party/skia/build/fuchsia/fidl_gen_cpp +++ b/chromium/third_party/skia/build/fuchsia/fidl_gen_cpp @@ -42,7 +42,6 @@ def main(): parser.add_argument('--json', dest='json', action='store', required=True) parser.add_argument('--include-base', dest='include_base', action='store', required=True) parser.add_argument('--output-base-cc', dest='output_base_cc', action='store', required=True) - parser.add_argument('--output-c-header', dest='output_header_c', action='store', required=True) parser.add_argument('--output-c-tables', dest='output_c_tables', action='store', required=True) args = parser.parse_args() @@ -54,8 +53,6 @@ def main(): fidlc_command = [ args.fidlc_bin, - '--c-header', - args.output_header_c, '--tables', args.output_c_tables, '--json', diff --git a/chromium/third_party/skia/build/fuchsia/sdk.gni b/chromium/third_party/skia/build/fuchsia/sdk.gni index 97d3fe62049..d8f6131fe75 100644 --- a/chromium/third_party/skia/build/fuchsia/sdk.gni +++ b/chromium/third_party/skia/build/fuchsia/sdk.gni @@ -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,10 +95,9 @@ template("_fuchsia_fidl_library") { inputs = [ invoker.meta ] outputs = [ - "$target_gen_dir/fuchsia/$library_name_slashes/c/fidl.h", - "$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 = [ @@ -115,11 +114,11 @@ 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"), - "--output-c-header", - rebase_path("$target_gen_dir/fuchsia/$library_name_slashes/c/fidl.h"), + 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"), + "--output-c-header", + rebase_path("$target_gen_dir/$library_name_slashes/c/fidl.h"), ] } |