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

Unified Diff: tools/gn.py

Issue 2464153003: GN: Fall back on dart_bootstrap where appropriate. (Closed)
Patch Set: Address comments Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/BUILD.gn ('k') | utils/invoke_dart.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn.py
diff --git a/tools/gn.py b/tools/gn.py
index 6155b8d2f2362e4ba8df43387ab8fb7c5abc354e..1ee3d33cd1e13a0664c1ae50ef2b4727803bdb72 100755
--- a/tools/gn.py
+++ b/tools/gn.py
@@ -72,14 +72,10 @@ def to_gn_args(args, mode, arch, target_os):
gn_args['target_cpu'] = target_cpu_for_arch(arch, target_os)
gn_args['host_cpu'] = host_cpu_for_arch(arch)
- # TODO(zra): This is for the observatory, which currently builds using the
- # checked-in sdk. If/when the observatory no longer builds with the
- # checked-in sdk, this can be removed.
- pub = 'pub'
- if host_os == 'win':
- pub = pub + ".bat"
- gn_args['dart_host_pub_exe'] = os.path.join(
- DART_ROOT, 'tools', 'sdks', host_os, 'dart-sdk', 'bin', pub)
+ # See: runtime/observatory/BUILD.gn.
+ # This allows the standalone build of the observatory to fall back on
+ # dart_bootstrap if the prebuilt SDK doesn't work.
+ gn_args['dart_host_pub_exe'] = ""
# For Fuchsia support, the default is to not compile in the root
# certificates.
« no previous file with comments | « runtime/vm/BUILD.gn ('k') | utils/invoke_dart.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698