| 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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 ldflags += [ | 288 ldflags += [ |
| 289 "-weak_framework", | 289 "-weak_framework", |
| 290 "CoreImage", | 290 "CoreImage", |
| 291 ] | 291 ] |
| 292 } | 292 } |
| 293 | 293 |
| 294 if (is_win || is_mac) { | 294 if (is_win || is_mac) { |
| 295 sources += | 295 sources += |
| 296 rebase_path(gypi_values.chrome_browser_win_mac_sources, ".", "//chrome") | 296 rebase_path(gypi_values.chrome_browser_win_mac_sources, ".", "//chrome") |
| 297 } | 297 } |
| 298 if (!is_android && !is_ios) { |
| 299 deps += [ "//net:net_browser_services" ] |
| 300 } |
| 298 if (!is_android && !is_ios && !is_chromeos && enable_configuration_policy) { | 301 if (!is_android && !is_ios && !is_chromeos && enable_configuration_policy) { |
| 299 sources += [ | 302 sources += [ |
| 300 "net/disk_cache_dir_policy_handler.cc", | 303 "net/disk_cache_dir_policy_handler.cc", |
| 301 "net/disk_cache_dir_policy_handler.h", | 304 "net/disk_cache_dir_policy_handler.h", |
| 302 ] | 305 ] |
| 303 } | 306 } |
| 304 if (!is_android && !is_ios && enable_configuration_policy) { | 307 if (!is_android && !is_ios && enable_configuration_policy) { |
| 305 sources += [ | 308 sources += [ |
| 306 "download/download_dir_policy_handler.cc", | 309 "download/download_dir_policy_handler.cc", |
| 307 "download/download_dir_policy_handler.h", | 310 "download/download_dir_policy_handler.h", |
| (...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1099 ] | 1102 ] |
| 1100 } | 1103 } |
| 1101 | 1104 |
| 1102 if (enable_wifi_bootstrapping) { | 1105 if (enable_wifi_bootstrapping) { |
| 1103 sources += [ | 1106 sources += [ |
| 1104 "local_discovery/wifi/mock_wifi_manager.cc", | 1107 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1105 "local_discovery/wifi/mock_wifi_manager.h", | 1108 "local_discovery/wifi/mock_wifi_manager.h", |
| 1106 ] | 1109 ] |
| 1107 } | 1110 } |
| 1108 } | 1111 } |
| OLD | NEW |