summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-05-01 15:36:23 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-01 22:36:58 +0000
commit2b2364bb2c6fbb88e6a4550abeb9141bc7cb949c (patch)
treef9a32a6b8de3cd777ba9078cebd63de62142fe5e /chrome/installer/util
parent7fe661b47213d343058810597851e30eeb68ad8b (diff)
downloadchromium_src-2b2364bb2c6fbb88e6a4550abeb9141bc7cb949c.zip
chromium_src-2b2364bb2c6fbb88e6a4550abeb9141bc7cb949c.tar.gz
chromium_src-2b2364bb2c6fbb88e6a4550abeb9141bc7cb949c.tar.bz2
Add a GN flag for the Windows multi-dll build.
The first pass of moving the other Chrome-specific build flags out of the root build config file and into the new one. This requires both ffmpeg and Blink changes to finish landing. Originally landed as https://codereview.chromium.org/1120803003/ TBR=scottmg@chromium.org TBR=ddorwin@chromium.org (widevine) CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg Review URL: https://codereview.chromium.org/1123433002 Cr-Commit-Position: refs/heads/master@{#327998}
Diffstat (limited to 'chrome/installer/util')
-rw-r--r--chrome/installer/util/BUILD.gn3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
index 4351912..e923633 100644
--- a/chrome/installer/util/BUILD.gn
+++ b/chrome/installer/util/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/chrome_build.gni")
import("//testing/test.gni")
static_library("util") {
@@ -261,7 +262,7 @@ if (is_win) {
"//base",
"//base:i18n",
"//base/test:test_support",
- "//chrome:chrome_version_resources",
+ "//chrome:other_version",
"//chrome/installer/test:alternate_version_generator_lib",
"//content/public/common",
"//testing/gmock",