Chromium Code Reviews| Index: sdk/BUILD.gn |
| diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn |
| index fa5f73ead95bbe7e774739d74716c8c8f1c653a4..d8bcfe56876231da3845ae73869be130b8f9c636 100644 |
| --- a/sdk/BUILD.gn |
| +++ b/sdk/BUILD.gn |
| @@ -20,7 +20,10 @@ declare_args() { |
| dart_platform_sdk = false |
| } |
| -if (is_fuchsia || is_fuchsia_host) { |
| +if (is_fuchsia || |
| + is_fuchsia_host || |
| + current_cpu == "arm64" || |
| + current_cpu == "arm") { |
| dart_platform_sdk = true |
| } |
| @@ -479,6 +482,23 @@ copy("copy_dev_compiler_require_js") { |
| ] |
| } |
| +# This rule copies tools to go along with ddc. |
| +copy("copy_dev_compiler_tools") { |
| + visibility = [ ":copy_dev_compiler_sdk" ] |
| + deps = [ |
|
zra
2017/05/22 20:56:09
This also needs to depend on ":copy_dev_compiler_j
Jacob
2017/05/22 21:29:02
Done.
|
| + "../utils/dartdevc:dartdevc_web", |
| + "../utils/dartdevc:stack_trace_mapper", |
| + ] |
| + dart_out = get_label_info("../utils/dartdevc:dartdevc_web", "root_out_dir") |
| + sources = [ |
| + "$dart_out/dev_compiler/build/web/dart_stack_trace_mapper.js", |
| + "$dart_out/dev_compiler/build/web/ddc_web_compiler.js", |
| + ] |
| + outputs = [ |
| + "$root_out_dir/dart-sdk/lib/dev_compiler/web/{{source_file_part}}", |
| + ] |
| +} |
| + |
| # This is the main rule for copying ddc's dependencies to lib/ |
| group("copy_dev_compiler_sdk") { |
| visibility = [ ":create_full_sdk" ] |
| @@ -486,6 +506,7 @@ group("copy_dev_compiler_sdk") { |
| ":copy_dev_compiler_js", |
| ":copy_dev_compiler_require_js", |
| ":copy_dev_compiler_summary", |
| + ":copy_dev_compiler_tools", |
| ] |
| } |
| @@ -711,9 +732,9 @@ group("create_platform_sdk") { |
| # Parts specific to the full SDK. |
| group("create_full_sdk") { |
| visibility = [ |
| - ":copy_dev_compiler_tools", |
| ":create_sdk", |
| ] |
| + |
| deps = [ |
| ":copy_dev_compiler_sdk", |
| ":copy_full_sdk_libraries", |
| @@ -733,20 +754,3 @@ group("create_sdk") { |
| deps += [ ":create_full_sdk" ] |
| } |
| } |
| - |
| -# This rule copies tools to go along with ddc. |
| -copy("copy_dev_compiler_tools") { |
| - deps = [ |
| - ":create_full_sdk", |
| - "../utils/dartdevc:dartdevc_web", |
| - "../utils/dartdevc:stack_trace_mapper", |
| - ] |
| - dart_out = get_label_info("../utils/dartdevc:dartdevc_web", "root_out_dir") |
| - sources = [ |
| - "$dart_out/dev_compiler/build/web/dart_stack_trace_mapper.js", |
| - "$dart_out/dev_compiler/build/web/ddc_web_compiler.js", |
| - ] |
| - outputs = [ |
| - "$root_out_dir/dart-sdk/lib/dev_compiler/web/{{source_file_part}}", |
| - ] |
| -} |