From 64275214e0ab409050f048cb7e4b4cf30e3df082 Mon Sep 17 00:00:00 2001 From: Brett Wilson Date: Tue, 26 Aug 2014 12:05:21 -0700 Subject: 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} --- chrome/utility/BUILD.gn | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'chrome/utility') 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", -- cgit v1.1