| 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("//chrome/common/features.gni") | 9 import("//chrome/common/features.gni") |
| 10 import("//media/media_options.gni") | 10 import("//media/media_options.gni") |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 [ rebase_path("../chrome_browser.gypi") ], | 35 [ rebase_path("../chrome_browser.gypi") ], |
| 36 "scope", | 36 "scope", |
| 37 [ "../chrome_browser.gypi" ]) | 37 [ "../chrome_browser.gypi" ]) |
| 38 | 38 |
| 39 if (is_win) { | 39 if (is_win) { |
| 40 # This is in a separate config so the flags can be applied to dependents. | 40 # This is in a separate config so the flags can be applied to dependents. |
| 41 # ldflags in GN aren't automatically inherited. | 41 # ldflags in GN aren't automatically inherited. |
| 42 config("browser_win_linker_flags") { | 42 config("browser_win_linker_flags") { |
| 43 libs = [ | 43 libs = [ |
| 44 "credui.lib", | 44 "credui.lib", |
| 45 "cryptui.lib", |
| 46 "dwmapi.lib", |
| 45 "netapi32.lib", | 47 "netapi32.lib", |
| 46 "ndfapi.lib", # Used by browser/net/net_error_diagnostics_dialog_win.h | 48 "ndfapi.lib", # Used by browser/net/net_error_diagnostics_dialog_win.h |
| 49 "pdh.lib", |
| 47 ] | 50 ] |
| 48 ldflags = [ "/DELAYLOAD:ndfapi.dll" ] | 51 ldflags = [ "/DELAYLOAD:ndfapi.dll" ] |
| 49 } | 52 } |
| 50 } | 53 } |
| 51 | 54 |
| 52 if (is_desktop_linux) { | 55 if (is_desktop_linux) { |
| 53 # Gnome-keyring is normally dynamically loaded. The gnome_keyring config | 56 # Gnome-keyring is normally dynamically loaded. The gnome_keyring config |
| 54 # will set this up. | 57 # will set this up. |
| 55 pkg_config("gnome_keyring") { | 58 pkg_config("gnome_keyring") { |
| 56 packages = [ "gnome-keyring-1" ] | 59 packages = [ "gnome-keyring-1" ] |
| (...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1325 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") | 1328 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") |
| 1326 deps = [ | 1329 deps = [ |
| 1327 "//components/google/core/browser", | 1330 "//components/google/core/browser", |
| 1328 "//components/omnibox/browser", | 1331 "//components/omnibox/browser", |
| 1329 "//components/rlz", | 1332 "//components/rlz", |
| 1330 "//components/search_engines", | 1333 "//components/search_engines", |
| 1331 "//rlz:rlz_lib", | 1334 "//rlz:rlz_lib", |
| 1332 ] | 1335 ] |
| 1333 } | 1336 } |
| 1334 } | 1337 } |
| OLD | NEW |