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/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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 287 ldflags += [ | 287 ldflags += [ |
| 288 "-weak_framework", | 288 "-weak_framework", |
| 289 "CoreImage", | 289 "CoreImage", |
| 290 ] | 290 ] |
| 291 } | 291 } |
| 292 | 292 |
| 293 if (is_win || is_mac) { | 293 if (is_win || is_mac) { |
| 294 sources += | 294 sources += |
| 295 rebase_path(gypi_values.chrome_browser_win_mac_sources, ".", "//chrome") | 295 rebase_path(gypi_values.chrome_browser_win_mac_sources, ".", "//chrome") |
| 296 } | 296 } |
| 297 if (!is_android && !is_ios) { | |
| 298 deps += [ "//net:net_browser_services" ] | |
|
Lei Zhang
2015/03/02 20:08:08
You can put this with line 390.
Anand Mistry (off Chromium)
2015/03/03 02:54:42
Done.
| |
| 299 } | |
| 297 if (!is_android && !is_ios && !is_chromeos && enable_configuration_policy) { | 300 if (!is_android && !is_ios && !is_chromeos && enable_configuration_policy) { |
| 298 sources += [ | 301 sources += [ |
| 299 "net/disk_cache_dir_policy_handler.cc", | 302 "net/disk_cache_dir_policy_handler.cc", |
| 300 "net/disk_cache_dir_policy_handler.h", | 303 "net/disk_cache_dir_policy_handler.h", |
| 301 ] | 304 ] |
| 302 } | 305 } |
| 303 if (!is_android && !is_ios && enable_configuration_policy) { | 306 if (!is_android && !is_ios && enable_configuration_policy) { |
| 304 sources += [ | 307 sources += [ |
| 305 "download/download_dir_policy_handler.cc", | 308 "download/download_dir_policy_handler.cc", |
| 306 "download/download_dir_policy_handler.h", | 309 "download/download_dir_policy_handler.h", |
| (...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1098 ] | 1101 ] |
| 1099 } | 1102 } |
| 1100 | 1103 |
| 1101 if (enable_wifi_bootstrapping) { | 1104 if (enable_wifi_bootstrapping) { |
| 1102 sources += [ | 1105 sources += [ |
| 1103 "local_discovery/wifi/mock_wifi_manager.cc", | 1106 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1104 "local_discovery/wifi/mock_wifi_manager.h", | 1107 "local_discovery/wifi/mock_wifi_manager.h", |
| 1105 ] | 1108 ] |
| 1106 } | 1109 } |
| 1107 } | 1110 } |
| OLD | NEW |