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

Unified Diff: utils/generate_patch_sdk.gni

Issue 2940513002: Revert "[fuchsia] Prepare for setting the Dart target architecture appropriately in the host binari… (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « utils/dartanalyzer/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: utils/generate_patch_sdk.gni
diff --git a/utils/generate_patch_sdk.gni b/utils/generate_patch_sdk.gni
index 4ec995784dd982469c7308f03bbbecee89a65228..31286f268812789e0785b6f5b594f52836530511 100644
--- a/utils/generate_patch_sdk.gni
+++ b/utils/generate_patch_sdk.gni
@@ -16,11 +16,12 @@ _dart_root = get_path_info("..", "abspath")
# - deps: extra dependencies that must be built ahead of time.
template("generate_patched_sdk") {
assert(defined(invoker.input_patches_dir),
- "Need input_patches_dir in $target_name")
+ "Need input_patches_dir in $target_name")
assert(defined(invoker.patched_sdk_dir),
- "Need patched_sdk_dir in $target_name")
+ "Need patched_sdk_dir in $target_name")
assert(defined(invoker.mode), "Need mode in $target_name")
action(target_name) {
+
if (defined(invoker.deps)) {
deps = invoker.deps
} else {
@@ -28,7 +29,7 @@ template("generate_patched_sdk") {
}
if (!prebuilt_dart_exe_works) {
- deps += [ "$_dart_root/runtime/bin:dart_bootstrap_host_arch($host_toolchain)" ]
+ deps += ["$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)"]
}
script = "$_dart_root/tools/patch_sdk.py"
@@ -49,10 +50,10 @@ template("generate_patched_sdk") {
args = [ "--quiet" ]
if (!prebuilt_dart_exe_works) {
dart_out_dir = get_label_info(
- "$_dart_root/runtime/bin:dart_bootstrap_host_arch($host_toolchain)",
- "root_out_dir")
- dart_bootstrap = rebase_path(
- "$dart_out_dir/dart_bootstrap_host_arch$executable_suffix")
+ "$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)",
+ "root_out_dir")
+ dart_bootstrap =
+ rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix")
args += [
"--dart-executable",
dart_bootstrap,
@@ -67,3 +68,4 @@ template("generate_patched_sdk") {
]
}
}
+
« no previous file with comments | « utils/dartanalyzer/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698