diff options
| author | Brett Wilson <brettw@chromium.org> | 2014-08-26 12:05:21 -0700 |
|---|---|---|
| committer | Brett Wilson <brettw@chromium.org> | 2014-08-26 19:08:09 +0000 |
| commit | 64275214e0ab409050f048cb7e4b4cf30e3df082 (patch) | |
| tree | 3efe516b53bfea848a919f7adb49494743c2410f /chrome/utility | |
| parent | 3f2fc908707451c46d322bcea57f8978ea68fdac (diff) | |
| download | chromium_src-64275214e0ab409050f048cb7e4b4cf30e3df082.zip chromium_src-64275214e0ab409050f048cb7e4b4cf30e3df082.tar.gz chromium_src-64275214e0ab409050f048cb7e4b4cf30e3df082.tar.bz2 | |
Work on GN build of Chrome.
Fixes the rest of the non-rtc and non-vpx linker errors for the chrome target.
BUG=
R=ajwong@chromium.org
Review URL: https://codereview.chromium.org/505853003
Cr-Commit-Position: refs/heads/master@{#291952}
Diffstat (limited to 'chrome/utility')
| -rw-r--r-- | chrome/utility/BUILD.gn | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn index 9a1ab9d..fedccad 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -34,7 +34,7 @@ static_library("utility") { ".", "..") } - if (enable_extensions == 1) { + if (enable_extensions) { deps += [ "//chrome/common/extensions/api", #"//third_party/libexif", TODO(GYP) @@ -63,8 +63,11 @@ static_library("utility") { } } - if (!use_openssl) { - sources -= [ "importer/nss_decryptor.cc" ] + if (use_openssl) { + if (!is_win && !is_mac) { + sources -= [ "importer/nss_decryptor.cc" ] + } + } else { # !use_openssl if (!is_win && !is_mac) { sources += [ "importer/nss_decryptor_system_nss.cc", |