Index: runtime/bin/BUILD.gn |
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn |
index 50db7e92c2bd05a857869ae0b4d7881332f9f37b..a93476f5655c0387bfdc0f932c05bb79afbea703 100644 |
--- a/runtime/bin/BUILD.gn |
+++ b/runtime/bin/BUILD.gn |
@@ -6,11 +6,7 @@ |
declare_args() { |
dart_io_support = false |
- # TODO(zra, jamesr): Remove this check once we start building boringssl for |
- # the fuchsia port. |
- if (!defined(is_fuchsia) || !is_fuchsia) { |
- dart_boringssl_path = "../../third_party/boringssl" |
- } |
+ dart_no_fallback_root_certificates = false |
} |
@@ -338,6 +334,8 @@ source_set("embedded_dart_io") { |
if (is_mac || is_ios) { |
libs = [ |
+ "CoreFoundation.framework", |
+ "CoreServices.framework", |
"Security.framework", |
] |
} else if (defined(is_fuchsia) && is_fuchsia) { |
@@ -346,8 +344,13 @@ source_set("embedded_dart_io") { |
] |
} else { |
deps = [ |
- rebase_path(dart_boringssl_path, "."), |
+ rebase_path("//third_party/boringssl", "."), |
zra
2016/09/19 20:51:14
This will break the outside-of-Fuchsia Flutter eng
P.Y.L.
2016/09/19 20:58:34
Ah, that's what I was missing. I thought the other
|
] |
+ if (is_linux && dart_no_fallback_root_certificates) { |
+ defines = [ |
+ "DART_IO_ROOT_CERTS_DISABLED" |
+ ] |
+ } |
} |
sources = io_impl_sources_gypi.sources + builtin_impl_sources_gypi.sources |
@@ -364,8 +367,9 @@ source_set("embedded_dart_io") { |
"log_win.cc", |
"log.h", |
] |
- if (is_linux) { |
- sources += [ "../../third_party/root_certificates/root_certificates.cc"] |
+ |
+ if (is_linux && !dart_no_fallback_root_certificates) { |
+ sources += [ "//third_party/root_certificates/root_certificates.cc"] |
} |
include_dirs = [ |
@@ -454,41 +458,49 @@ if (defined(is_fuchsia) && is_fuchsia) { |
sources = [ "../tests/vm/dart/hello_fuchsia_test.dart" ] |
outputs = [ "$root_out_dir/hello_fuchsia.dart" ] |
} |
+} |
- executable("dart_no_observatory") { |
- configs += ["..:dart_config", |
- "..:dart_product_config", |
- "..:dart_precompiled_runtime_config",] |
- deps = [ |
+executable("dart_no_observatory") { |
+ configs += ["..:dart_config", |
+ "..:dart_product_config", |
+ "..:dart_precompiled_runtime_config",] |
+ deps = [ |
+ ":gen_resources_cc", |
+ ":embedded_dart_io", |
+ ":libdart_builtin", |
+ "../vm:libdart_platform", |
+ "..:libdart", |
+ ":dart_snapshot_cc", |
+ "../../pkg:pkg", # Pull this out to top-level for a real SDK build. |
+ "//third_party/zlib", |
+ ] |
+ |
+ if (defined(is_fuchsia) && is_fuchsia) { |
+ deps += [ |
":hello_fuchsia", |
- ":gen_resources_cc", |
- ":embedded_dart_io", |
- ":libdart_builtin", |
- "../vm:libdart_platform", |
- "..:libdart", |
- ":dart_snapshot_cc", |
- "../../pkg:pkg", # Pull this out to top-level for a real SDK build. |
- "//third_party/zlib", |
] |
+ } |
- defines = [ |
- "NO_OBSERVATORY", |
- ] |
+ defines = [ |
+ "NO_OBSERVATORY", |
+ ] |
- sources = [ |
- "main.cc", |
- "observatory_assets_empty.cc", |
- "vmservice_impl.cc", |
- "vmservice_impl.h", |
- "$target_gen_dir/resources_gen.cc", |
- ] |
+ sources = [ |
+ "main.cc", |
+ "observatory_assets_empty.cc", |
+ "vmservice_impl.cc", |
+ "vmservice_impl.h", |
+ "$target_gen_dir/resources_gen.cc", |
+ ] |
- include_dirs = [ |
- "..", |
- "//third_party", |
- ] |
- } |
+ include_dirs = [ |
+ "..", |
+ "//third_party", |
+ ] |
+} |
+ |
+if (defined(is_fuchsia) && is_fuchsia) { |
action("generate_snapshot_test_dat_file") { |
snapshot_test_dat_file = "$root_gen_dir/snapshot_test.dat" |
snapshot_test_in_dat_file = "../vm/snapshot_test_in.dat" |