Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Side by Side Diff: utils/generate_patch_sdk.gni

Issue 2953873002: Fix previous CL where dart_bootstrap was accidently changed to dart_bootstrap_host_arch (Closed)
Patch Set: And two more places where host_toolchain should be replaced with dart_host_toolchain Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file 1 # Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
2 # for details. All rights reserved. Use of this source code is governed by a 2 # for details. All rights reserved. Use of this source code is governed by a
3 # BSD-style license that can be found in the LICENSE file. 3 # BSD-style license that can be found in the LICENSE file.
4 4
5 import("../build/prebuilt_dart_sdk.gni") 5 import("../build/prebuilt_dart_sdk.gni")
6 import("../build/dart_host_toolchain.gni") 6 import("../build/dart_host_toolchain.gni")
7 7
8 _dart_root = get_path_info("..", "abspath") 8 _dart_root = get_path_info("..", "abspath")
9 9
10 # Template to generate a patched_sdk folder. This invokes the tools/patch_sdk.py 10 # Template to generate a patched_sdk folder. This invokes the tools/patch_sdk.py
(...skipping 11 matching lines...) Expand all
22 "Need patched_sdk_dir in $target_name") 22 "Need patched_sdk_dir in $target_name")
23 assert(defined(invoker.mode), "Need mode in $target_name") 23 assert(defined(invoker.mode), "Need mode in $target_name")
24 action(target_name) { 24 action(target_name) {
25 if (defined(invoker.deps)) { 25 if (defined(invoker.deps)) {
26 deps = invoker.deps 26 deps = invoker.deps
27 } else { 27 } else {
28 deps = [] 28 deps = []
29 } 29 }
30 30
31 if (!prebuilt_dart_exe_works) { 31 if (!prebuilt_dart_exe_works) {
32 deps += [ "$_dart_root/runtime/bin:dart_bootstrap_host_arch($dart_host_too lchain)" ] 32 deps += [ "$_dart_root/runtime/bin:dart_bootstrap($dart_host_toolchain)" ]
33 } 33 }
34 34
35 script = "$_dart_root/tools/patch_sdk.py" 35 script = "$_dart_root/tools/patch_sdk.py"
36 36
37 # We list the `patch_sdk.dart` tool here because the [script] (which is 37 # We list the `patch_sdk.dart` tool here because the [script] (which is
38 # implicitly an input) will call it. 38 # implicitly an input) will call it.
39 inputs = [ 39 inputs = [
40 "$_dart_root/tools/patch_sdk.dart", 40 "$_dart_root/tools/patch_sdk.dart",
41 ] 41 ]
42 42
43 depfile = "$root_out_dir/${target_name}.d" 43 depfile = "$root_out_dir/${target_name}.d"
44 44
45 outputs = [ 45 outputs = [
46 # Instead of listing all outputs we list a single well-known one. 46 # Instead of listing all outputs we list a single well-known one.
47 "$root_out_dir/${invoker.patched_sdk_dir}/platform.dill", 47 "$root_out_dir/${invoker.patched_sdk_dir}/platform.dill",
48 ] 48 ]
49 49
50 args = [ "--quiet" ] 50 args = [ "--quiet" ]
51 if (!prebuilt_dart_exe_works) { 51 if (!prebuilt_dart_exe_works) {
52 dart_out_dir = get_label_info( 52 dart_out_dir = get_label_info(
53 "$_dart_root/runtime/bin:dart_bootstrap_host_arch($dart_host_toolc hain)", 53 "$_dart_root/runtime/bin:dart_bootstrap($dart_host_toolchain)",
54 "root_out_dir") 54 "root_out_dir")
55 dart_bootstrap = 55 dart_bootstrap =
56 rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix") 56 rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix")
57 args += [ 57 args += [
58 "--dart-executable", 58 "--dart-executable",
59 dart_bootstrap, 59 dart_bootstrap,
60 ] 60 ]
61 } 61 }
62 args += [ 62 args += [
63 invoker.mode, 63 invoker.mode,
64 rebase_path("$_dart_root/sdk"), 64 rebase_path("$_dart_root/sdk"),
65 rebase_path(invoker.input_patches_dir), 65 rebase_path(invoker.input_patches_dir),
66 rebase_path("$root_out_dir/${invoker.patched_sdk_dir}", root_build_dir), 66 rebase_path("$root_out_dir/${invoker.patched_sdk_dir}", root_build_dir),
67 rebase_path("$_dart_root/.packages"), 67 rebase_path("$_dart_root/.packages"),
68 ] 68 ]
69 } 69 }
70 } 70 }
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698