| 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/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//build/split_static_library.gni") | 9 import("//build/split_static_library.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 "/DELAYLOAD:pdh.dll", # The task manager is rarely used. | 54 "/DELAYLOAD:pdh.dll", # The task manager is rarely used. |
| 55 ] | 55 ] |
| 56 } | 56 } |
| 57 } | 57 } |
| 58 | 58 |
| 59 if (is_desktop_linux) { | 59 if (is_desktop_linux) { |
| 60 # Gnome-keyring is normally dynamically loaded. The gnome_keyring config | 60 # Gnome-keyring is normally dynamically loaded. The gnome_keyring config |
| 61 # will set this up. | 61 # will set this up. |
| 62 pkg_config("gnome_keyring") { | 62 pkg_config("gnome_keyring") { |
| 63 packages = [ "gnome-keyring-1" ] | 63 packages = [ "gnome-keyring-1" ] |
| 64 defines = [ | 64 defines = [ "USE_GNOME_KEYRING" ] |
| 65 "USE_GNOME_KEYRING", | |
| 66 "DLOPEN_GNOME_KEYRING", | |
| 67 ] | |
| 68 ignore_libs = true | 65 ignore_libs = true |
| 69 } | 66 } |
| 70 | 67 |
| 71 # If you want to link gnome-keyring directly (use only for unit tests) | 68 # If you want to link gnome-keyring directly (use only for unit tests) |
| 72 # ADDITIONALLY add this config on top of ":gnome_keyring". pkg-config is a | 69 # ADDITIONALLY add this config on top of ":gnome_keyring". pkg-config is a |
| 73 # bit slow, so prefer not to run it again. In practice, gnome-keyring's libs | 70 # bit slow, so prefer not to run it again. In practice, gnome-keyring's libs |
| 74 # are just itself and common gnome ones we link already, so we can get away | 71 # are just itself and common gnome ones we link already, so we can get away |
| 75 # with additionally just coding the library name here. | 72 # with additionally just coding the library name here. |
| 76 config("gnome_keyring_direct") { | 73 config("gnome_keyring_direct") { |
| 77 libs = [ "gnome-keyring" ] | 74 libs = [ "gnome-keyring" ] |
| (...skipping 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1384 # linking all of the test support. | 1381 # linking all of the test support. |
| 1385 static_library("pepper_cdm_test_constants") { | 1382 static_library("pepper_cdm_test_constants") { |
| 1386 testonly = true | 1383 testonly = true |
| 1387 visibility = [ "//chrome/*" ] | 1384 visibility = [ "//chrome/*" ] |
| 1388 sources = [ | 1385 sources = [ |
| 1389 "media/pepper_cdm_test_constants.cc", | 1386 "media/pepper_cdm_test_constants.cc", |
| 1390 "media/pepper_cdm_test_constants.h", | 1387 "media/pepper_cdm_test_constants.h", |
| 1391 ] | 1388 ] |
| 1392 } | 1389 } |
| 1393 } | 1390 } |
| OLD | NEW |