diff options
| author | brettw <brettw@chromium.org> | 2015-12-02 14:03:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-02 22:08:12 +0000 |
| commit | 62fbdbc1e9f7caaec0fb2248e95e150c65ffa812 (patch) | |
| tree | 742b26113901df86df896999b8d306da39d95143 | |
| parent | 7ff79f9569429444dabdb6d5024918bc548916b3 (diff) | |
| download | chromium_src-62fbdbc1e9f7caaec0fb2248e95e150c65ffa812.zip chromium_src-62fbdbc1e9f7caaec0fb2248e95e150c65ffa812.tar.gz chromium_src-62fbdbc1e9f7caaec0fb2248e95e150c65ffa812.tar.bz2 | |
Set v8_use_external_startup_data for GN Windows build.
This matches GYP.
BUG=545641
R=dpranke@chromium.org
Review URL: https://codereview.chromium.org/1495673002
Cr-Commit-Position: refs/heads/master@{#362804}
| -rw-r--r-- | build_overrides/v8.gni | 3 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/BUILD.gn | 21 |
2 files changed, 12 insertions, 12 deletions
diff --git a/build_overrides/v8.gni b/build_overrides/v8.gni index b4b933b..e50a6a2 100644 --- a/build_overrides/v8.gni +++ b/build_overrides/v8.gni @@ -11,9 +11,8 @@ enable_correct_v8_arch = false # TODO: Set v8_use_external_startup_data to true on Windows and iOS to match # GYP. -# Windows - http://crbug.com/545641 # iOS - http://crbug.com/545676 -v8_use_external_startup_data = !(is_win || is_ios) +v8_use_external_startup_data = !is_ios # V8 extras # Adding V8 extras files requires API owners review diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn index d04febf..c205f8c 100644 --- a/chrome/installer/mini_installer/BUILD.gn +++ b/chrome/installer/mini_installer/BUILD.gn @@ -115,6 +115,16 @@ action("archive") { #'--verbose', ] + deps = [ + "//chrome", + "//chrome:main_dll", + "//chrome/browser/extensions/default_extensions", + "//chrome/installer/setup", + "//third_party/icu:icudata", + + #"../chrome.gyp:chrome_nacl_win64", TODO(GYP) bug 512869. + ] + if (enable_hidpi) { args += [ "--enable_hidpi=1" ] } @@ -145,6 +155,7 @@ action("archive") { "$root_out_dir/natives_blob.bin", "$root_out_dir/snapshot_blob.bin", ] + deps += [ "//v8" ] } depfile = "$target_gen_dir/archive.d" @@ -153,16 +164,6 @@ action("archive") { rebase_path(depfile, root_build_dir), ] - deps = [ - "//chrome", - "//chrome:main_dll", - "//chrome/browser/extensions/default_extensions", - "//chrome/installer/setup", - "//third_party/icu:icudata", - - #"../chrome.gyp:chrome_nacl_win64", TODO(GYP) bug 512869. - ] - if (enable_nacl) { deps += [ "//ppapi/native_client:irt" ] } |