Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 4304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4315 if (use_gnome_keyring && current_cpu == "x64") { | 4315 if (use_gnome_keyring && current_cpu == "x64") { |
| 4316 # Only add this test for 64 bit builds because otherwise we need the 32 | 4316 # Only add this test for 64 bit builds because otherwise we need the 32 |
| 4317 # bit library on 64 bit systems when running this test. | 4317 # bit library on 64 bit systems when running this test. |
| 4318 sources += | 4318 sources += |
| 4319 [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ] | 4319 [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ] |
| 4320 configs += [ | 4320 configs += [ |
| 4321 "//components/os_crypt:gnome_keyring", | 4321 "//components/os_crypt:gnome_keyring", |
| 4322 "//components/os_crypt:gnome_keyring_direct", | 4322 "//components/os_crypt:gnome_keyring_direct", |
| 4323 ] | 4323 ] |
| 4324 } | 4324 } |
| 4325 if (is_linux && !is_chromeos) { | 4325 if (is_linux && !is_chromeos && !use_ozone) { |
|
Nico
2016/09/14 18:17:12
should this check is_desktop_linux like the non-te
tonikitoo
2016/09/14 18:56:44
I believe so. I will follow up on this, so that we
| |
| 4326 sources += | 4326 sources += |
| 4327 [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ] | 4327 [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ] |
| 4328 deps += [ "//third_party/libsecret" ] | 4328 deps += [ "//third_party/libsecret" ] |
| 4329 } | 4329 } |
| 4330 if (is_linux && use_aura) { | 4330 if (is_linux && use_aura) { |
| 4331 deps += [ "//ui/aura:test_support" ] | 4331 deps += [ "//ui/aura:test_support" ] |
| 4332 if (use_dbus) { | 4332 if (use_dbus) { |
| 4333 deps += [ "//dbus:test_support" ] | 4333 deps += [ "//dbus:test_support" ] |
| 4334 } | 4334 } |
| 4335 } | 4335 } |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4985 "touch_hud", | 4985 "touch_hud", |
| 4986 "ui", | 4986 "ui", |
| 4987 ] | 4987 ] |
| 4988 | 4988 |
| 4989 if (is_linux && !is_android) { | 4989 if (is_linux && !is_android) { |
| 4990 deps += [ "//components/font_service:manifest" ] | 4990 deps += [ "//components/font_service:manifest" ] |
| 4991 packaged_services += [ "font_service" ] | 4991 packaged_services += [ "font_service" ] |
| 4992 } | 4992 } |
| 4993 } | 4993 } |
| 4994 } | 4994 } |
| OLD | NEW |