| 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 import("//components/nacl/nacl_defines.gni") | 8 import("//components/nacl/nacl_defines.gni") |
| 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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 ".", "//chrome") | 246 ".", "//chrome") |
| 247 deps += [ | 247 deps += [ |
| 248 #"app_shim" TODO(GYP) | 248 #"app_shim" TODO(GYP) |
| 249 #"browser_app_shim" TODO(GYP) | 249 #"browser_app_shim" TODO(GYP) |
| 250 ] | 250 ] |
| 251 } | 251 } |
| 252 if (is_mac || is_ios) { | 252 if (is_mac || is_ios) { |
| 253 sources += rebase_path(gypi_values.chrome_browser_mac_ios_sources, | 253 sources += rebase_path(gypi_values.chrome_browser_mac_ios_sources, |
| 254 ".", "//chrome") | 254 ".", "//chrome") |
| 255 } | 255 } |
| 256 if (cld2_data_source == "component") { | |
| 257 sources += [ | |
| 258 "component_updater/cld_component_installer.cc", | |
| 259 "component_updater/cld_component_installer.h", | |
| 260 ] | |
| 261 } | |
| 262 if (enable_extensions) { | 256 if (enable_extensions) { |
| 263 public_deps += [ "//chrome/browser/extensions" ] | 257 public_deps += [ "//chrome/browser/extensions" ] |
| 264 deps += [ | 258 deps += [ |
| 265 "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_pr
oto", | 259 "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_pr
oto", |
| 266 "//chrome/common/extensions/api", | 260 "//chrome/common/extensions/api", |
| 267 "//chrome/common/extensions/api:api_registration", | 261 "//chrome/common/extensions/api:api_registration", |
| 268 "//extensions/components/javascript_dialog_extensions_client", | 262 "//extensions/components/javascript_dialog_extensions_client", |
| 269 ] | 263 ] |
| 270 sources += rebase_path(gypi_values.chrome_browser_extensions_sources, | 264 sources += rebase_path(gypi_values.chrome_browser_extensions_sources, |
| 271 ".", "//chrome") | 265 ".", "//chrome") |
| (...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 965 ] | 959 ] |
| 966 } | 960 } |
| 967 | 961 |
| 968 if (enable_wifi_bootstrapping) { | 962 if (enable_wifi_bootstrapping) { |
| 969 sources += [ | 963 sources += [ |
| 970 "local_discovery/wifi/mock_wifi_manager.cc", | 964 "local_discovery/wifi/mock_wifi_manager.cc", |
| 971 "local_discovery/wifi/mock_wifi_manager.h", | 965 "local_discovery/wifi/mock_wifi_manager.h", |
| 972 ] | 966 ] |
| 973 } | 967 } |
| 974 } | 968 } |
| OLD | NEW |