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

Side by Side Diff: runtime/observatory/BUILD.gn

Issue 2944103003: Introduce dart_host_toolchain arg, remove '--checked' option from patch_sdk.py (Closed)
Patch Set: Add comment 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/dart_host_toolchain.gni ('k') | tools/patch_sdk.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("../../build/executable_suffix.gni") 5 import("../../build/executable_suffix.gni")
6 import("../../build/prebuilt_dart_sdk.gni") 6 import("../../build/prebuilt_dart_sdk.gni")
7 import("../../build/dart_host_toolchain.gni")
7 8
8 # Currently paths here are hard coded for convenience in building Mojo/Flutter. 9 # Currently paths here are hard coded for convenience in building Mojo/Flutter.
9 declare_args() { 10 declare_args() {
10 # Specify the path to a host compatible version of the Dart SDK. 11 # Specify the path to a host compatible version of the Dart SDK.
11 # This SDK is used to compile the Observatory frontend sources. 12 # This SDK is used to compile the Observatory frontend sources.
12 dart_host_sdk = rebase_path("//third_party/dart-sdk/dart-sdk") 13 dart_host_sdk = rebase_path("//third_party/dart-sdk/dart-sdk")
13 14
14 # Specify the path to a host compatible version of pub. 15 # Specify the path to a host compatible version of pub.
15 # This is used to compile the Observatory frontend sources. 16 # This is used to compile the Observatory frontend sources.
16 # 17 #
(...skipping 16 matching lines...) Expand all
33 34
34 # Construct arguments to the observatory tool for finding pub. 35 # Construct arguments to the observatory tool for finding pub.
35 pub_build_deps = [] 36 pub_build_deps = []
36 pub_build_args = [] 37 pub_build_args = []
37 if (dart_host_pub_exe != "") { 38 if (dart_host_pub_exe != "") {
38 pub_build_args = [ 39 pub_build_args = [
39 "--pub-executable", 40 "--pub-executable",
40 dart_host_pub_exe, 41 dart_host_pub_exe,
41 ] 42 ]
42 } else if (!prebuilt_dart_exe_works) { 43 } else if (!prebuilt_dart_exe_works) {
43 pub_build_deps += [ "../bin:dart_bootstrap($host_toolchain)" ] 44 pub_build_deps += [ "../bin:dart_bootstrap($dart_host_toolchain)" ]
44 45
45 dart_out_dir = 46 dart_out_dir = get_label_info("../bin:dart_bootstrap($dart_host_toolchain)",
46 get_label_info("../bin:dart_bootstrap($host_toolchain)", "root_out_dir") 47 "root_out_dir")
47 dart_bootstrap = rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix") 48 dart_bootstrap = rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix")
48 49
49 pub_build_args = [ 50 pub_build_args = [
50 "--sdk=True", 51 "--sdk=True",
51 "--dart-executable", 52 "--dart-executable",
52 dart_bootstrap, 53 dart_bootstrap,
53 ] 54 ]
54 } else { 55 } else {
55 pub_build_args = [ "--sdk=True" ] 56 pub_build_args = [ "--sdk=True" ]
56 } 57 }
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 244
244 source_set("standalone_observatory_archive") { 245 source_set("standalone_observatory_archive") {
245 deps = [ 246 deps = [
246 ":standalone_archive_observatory", 247 ":standalone_archive_observatory",
247 ] 248 ]
248 249
249 sources = [ 250 sources = [
250 rebase_path("$root_gen_dir/observatory/standalone_archive_observatory.cc"), 251 rebase_path("$root_gen_dir/observatory/standalone_archive_observatory.cc"),
251 ] 252 ]
252 } 253 }
OLDNEW
« no previous file with comments | « build/dart_host_toolchain.gni ('k') | tools/patch_sdk.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698