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

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

Issue 2951133002: Mostly revert "[fuchsia] Prepare for setting the Dart target architecture appropriately in the host… (Closed)
Patch Set: gn format 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 | « runtime/bin/BUILD.gn ('k') | runtime/vm/BUILD.gn » ('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 7
8 # Currently paths here are hard coded for convenience in building Mojo/Flutter. 8 # Currently paths here are hard coded for convenience in building Mojo/Flutter.
9 declare_args() { 9 declare_args() {
10 # Specify the path to a host compatible version of the Dart SDK. 10 # Specify the path to a host compatible version of the Dart SDK.
(...skipping 22 matching lines...) Expand all
33 33
34 # Construct arguments to the observatory tool for finding pub. 34 # Construct arguments to the observatory tool for finding pub.
35 pub_build_deps = [] 35 pub_build_deps = []
36 pub_build_args = [] 36 pub_build_args = []
37 if (dart_host_pub_exe != "") { 37 if (dart_host_pub_exe != "") {
38 pub_build_args = [ 38 pub_build_args = [
39 "--pub-executable", 39 "--pub-executable",
40 dart_host_pub_exe, 40 dart_host_pub_exe,
41 ] 41 ]
42 } else if (!prebuilt_dart_exe_works) { 42 } else if (!prebuilt_dart_exe_works) {
43 pub_build_deps += [ "../bin:dart_bootstrap_host_arch($host_toolchain)" ] 43 pub_build_deps += [ "../bin:dart_bootstrap($host_toolchain)" ]
44 44
45 dart_out_dir = 45 dart_out_dir =
46 get_label_info("../bin:dart_bootstrap_host_arch($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 =
49 rebase_path("$dart_out_dir/dart_bootstrap_host_arch$executable_suffix")
50 48
51 pub_build_args = [ 49 pub_build_args = [
52 "--sdk=True", 50 "--sdk=True",
53 "--dart-executable", 51 "--dart-executable",
54 dart_bootstrap, 52 dart_bootstrap,
55 ] 53 ]
56 } else { 54 } else {
57 pub_build_args = [ "--sdk=True" ] 55 pub_build_args = [ "--sdk=True" ]
58 } 56 }
59 57
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 243
246 source_set("standalone_observatory_archive") { 244 source_set("standalone_observatory_archive") {
247 deps = [ 245 deps = [
248 ":standalone_archive_observatory", 246 ":standalone_archive_observatory",
249 ] 247 ]
250 248
251 sources = [ 249 sources = [
252 rebase_path("$root_gen_dir/observatory/standalone_archive_observatory.cc"), 250 rebase_path("$root_gen_dir/observatory/standalone_archive_observatory.cc"),
253 ] 251 ]
254 } 252 }
OLDNEW
« no previous file with comments | « runtime/bin/BUILD.gn ('k') | runtime/vm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698