| 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/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 | 8 |
| 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which | 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which |
| 10 # produces a conflict for the "grit" template so we have to only include one. | 10 # produces a conflict for the "grit" template so we have to only include one. |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 # If you want to link gnome-keyring directly (use only for unit tests) | 41 # If you want to link gnome-keyring directly (use only for unit tests) |
| 42 # ADDITIONALLY add this config on top of ":gnome_keyring". pkg-config is a | 42 # ADDITIONALLY add this config on top of ":gnome_keyring". pkg-config is a |
| 43 # bit slow, so prefer not to run it again. In practice, gnome-keyring's libs | 43 # bit slow, so prefer not to run it again. In practice, gnome-keyring's libs |
| 44 # are just itself and common gnome ones we link already, so we can get away | 44 # are just itself and common gnome ones we link already, so we can get away |
| 45 # with additionally just coding the library name here. | 45 # with additionally just coding the library name here. |
| 46 config("gnome_keyring_direct") { | 46 config("gnome_keyring_direct") { |
| 47 libs = [ "gnome-keyring" ] | 47 libs = [ "gnome-keyring" ] |
| 48 } | 48 } |
| 49 } | 49 } |
| 50 | 50 |
| 51 static_library("browser") { | 51 source_set("browser") { |
| 52 configs += [ | 52 configs += [ |
| 53 "//build/config/compiler:wexit_time_destructors", | 53 "//build/config/compiler:wexit_time_destructors", |
| 54 "//third_party/WebKit/public:debug_devtools", | 54 "//third_party/WebKit/public:debug_devtools", |
| 55 ] | 55 ] |
| 56 defines = [] | 56 defines = [] |
| 57 sources = [] | 57 sources = [] |
| 58 libs = [] | 58 libs = [] |
| 59 ldflags = [] | 59 ldflags = [] |
| 60 | 60 |
| 61 # iOS/non-iOS shared deps. New dependencies should generally be added in the | 61 # iOS/non-iOS shared deps. New dependencies should generally be added in the |
| (...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 "//chrome_elf:dll_hash", | 675 "//chrome_elf:dll_hash", |
| 676 "//components/browser_watcher", | 676 "//components/browser_watcher", |
| 677 "//components/browser_watcher:browser_watcher_client", | 677 "//components/browser_watcher:browser_watcher_client", |
| 678 "//google_update", | 678 "//google_update", |
| 679 "//third_party/iaccessible2", | 679 "//third_party/iaccessible2", |
| 680 "//third_party/isimpledom", | 680 "//third_party/isimpledom", |
| 681 "//third_party/wtl", | 681 "//third_party/wtl", |
| 682 "//ui/metro_viewer", | 682 "//ui/metro_viewer", |
| 683 "//win8:metro_viewer", | 683 "//win8:metro_viewer", |
| 684 ] | 684 ] |
| 685 libs += [ "credui.lib" ] | 685 libs += [ |
| 686 "credui.lib", |
| 687 "netapi32.lib", |
| 688 ] |
| 686 } else { | 689 } else { |
| 687 # Non-Windows. | 690 # Non-Windows. |
| 688 sources += | 691 sources += |
| 689 rebase_path(gypi_values.chrome_browser_non_win_sources, ".", "//chrome") | 692 rebase_path(gypi_values.chrome_browser_non_win_sources, ".", "//chrome") |
| 690 if (toolkit_views) { | 693 if (toolkit_views) { |
| 691 deps += [ | 694 deps += [ |
| 692 "//ui/views", | 695 "//ui/views", |
| 693 "//ui/views/controls/webview", | 696 "//ui/views/controls/webview", |
| 694 ] | 697 ] |
| 695 } | 698 } |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1111 ] | 1114 ] |
| 1112 } | 1115 } |
| 1113 | 1116 |
| 1114 if (enable_wifi_bootstrapping) { | 1117 if (enable_wifi_bootstrapping) { |
| 1115 sources += [ | 1118 sources += [ |
| 1116 "local_discovery/wifi/mock_wifi_manager.cc", | 1119 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1117 "local_discovery/wifi/mock_wifi_manager.h", | 1120 "local_discovery/wifi/mock_wifi_manager.h", |
| 1118 ] | 1121 ] |
| 1119 } | 1122 } |
| 1120 } | 1123 } |
| OLD | NEW |