diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-01-19 21:15:24 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-01-23 11:53:02 +0000 |
| commit | 7a1be30cf0d82533b44058fdaeabdcd71ba9bd53 (patch) | |
| tree | 5612a5e4833a60140269eddcbaeda6196173aedb | |
| parent | 11e5c2ddbda46865261266214ed1345679fef0d2 (diff) | |
Do not require gnome-keyring
Some machines in CI do not have it.
Change-Id: I0b1ef072bb061b063fa7d0e355f6069fdf7d10a1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/chrome/browser/BUILD.gn | 4 | ||||
| -rw-r--r-- | chromium/chrome/test/BUILD.gn | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chromium/chrome/browser/BUILD.gn b/chromium/chrome/browser/BUILD.gn index 04ad999128e..a327b529983 100644 --- a/chromium/chrome/browser/BUILD.gn +++ b/chromium/chrome/browser/BUILD.gn @@ -56,7 +56,7 @@ if (is_win) { } } -if (is_desktop_linux) { +if (is_desktop_linux && !use_qt) { # Gnome-keyring is normally dynamically loaded. The gnome_keyring config # will set this up. pkg_config("gnome_keyring") { @@ -592,7 +592,7 @@ split_static_library("browser") { if (use_cups) { configs += [ "//printing:cups" ] } - if (is_desktop_linux) { + if (is_desktop_linux && !use_qt) { sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources, ".", "//chrome") diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn index 53f36ec35aa..d2e1074d569 100644 --- a/chromium/chrome/test/BUILD.gn +++ b/chromium/chrome/test/BUILD.gn @@ -2118,7 +2118,7 @@ test("unit_tests") { } else { sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] } - if (is_desktop_linux && current_cpu == "x64") { + if (is_desktop_linux && current_cpu == "x64" && !use_qt) { # Only add this test for 64 bit builds because otherwise we need the 32 # bit library on 64 bit systems when running this test. sources += |