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

Unified Diff: runtime/bin/BUILD.gn

Issue 2351743004: Added a target for a host version of the dart executable. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/dart-lang/sdk/@master
Patch Set: Fixed third_party paths. Created 4 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/BUILD.gn
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
index 50db7e92c2bd05a857869ae0b4d7881332f9f37b..c5fc980568762b25f82542eeafeb5118a4086690 100644
--- a/runtime/bin/BUILD.gn
+++ b/runtime/bin/BUILD.gn
@@ -4,13 +4,11 @@
declare_args() {
+ dart_third_party_base = "//dart/third_party"
+
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
}
@@ -270,7 +268,7 @@ source_set("gen_snapshot_dart_io") {
"..:dart_precompiler_config"]
deps = [
- "//third_party/zlib",
+ dart_third_party_base + "/zlib",
zra 2016/09/19 21:14:27 As it turns out, in the Flutter engine build, zlib
P.Y.L. 2016/09/19 21:16:47 LOL. How about I leave zlib alone for now and we a
]
custom_sources_filter = [
@@ -299,7 +297,7 @@ source_set("gen_snapshot_dart_io") {
include_dirs = [
"..",
- "//third_party"
+ dart_third_party_base,
]
}
@@ -338,6 +336,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 +346,13 @@ source_set("embedded_dart_io") {
]
} else {
deps = [
- rebase_path(dart_boringssl_path, "."),
+ rebase_path(dart_third_party_base + "/boringssl", "."),
]
+ 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,13 +369,14 @@ 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 += [ dart_third_party_base + "/root_certificates/root_certificates.cc"]
}
include_dirs = [
"..",
- "//third_party"
+ dart_third_party_base,
]
}
@@ -454,41 +460,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.
+ dart_third_party_base + "/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 = [
+ "..",
+ dart_third_party_base,
+ ]
+}
+
+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"
@@ -529,7 +543,7 @@ if (defined(is_fuchsia) && is_fuchsia) {
":dart_snapshot_cc",
":generate_snapshot_test_dat_file",
"../vm:libdart_platform",
- "//third_party/zlib",
+ dart_third_party_base + "/zlib",
]
include_dirs = [
"..",
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698