Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Side by Side Diff: chrome/browser/BUILD.gn

Issue 461633002: Refactor language detection logic to allow non-static CLD data sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error in chrome/browser/BUILD.gn Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 ] 229 ]
230 } 230 }
231 if (is_mac) { 231 if (is_mac) {
232 sources += rebase_path(gypi_values.chrome_browser_mac_sources, 232 sources += rebase_path(gypi_values.chrome_browser_mac_sources,
233 ".", "//chrome") 233 ".", "//chrome")
234 deps += [ 234 deps += [
235 #"app_shim" TODO(GYP) 235 #"app_shim" TODO(GYP)
236 #"browser_app_shim" TODO(GYP) 236 #"browser_app_shim" TODO(GYP)
237 ] 237 ]
238 } 238 }
239 if (cld2_data_source == "component") {
240 sources += [
241 "component_updater/cld_component_installer.cc",
242 "component_updater/cld_component_installer.h",
243 ]
244 }
245 if (enable_extensions) { 239 if (enable_extensions) {
246 public_deps += [ "//chrome/browser/extensions" ] 240 public_deps += [ "//chrome/browser/extensions" ]
247 deps += [ 241 deps += [
248 "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_pr oto", 242 "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_pr oto",
249 "//chrome/common/extensions/api", 243 "//chrome/common/extensions/api",
250 "//chrome/common/extensions/api:api_registration", 244 "//chrome/common/extensions/api:api_registration",
251 ] 245 ]
252 sources += rebase_path(gypi_values.chrome_browser_extensions_sources, 246 sources += rebase_path(gypi_values.chrome_browser_extensions_sources,
253 ".", "//chrome") 247 ".", "//chrome")
254 } 248 }
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 ] 916 ]
923 } 917 }
924 918
925 if (enable_wifi_bootstrapping) { 919 if (enable_wifi_bootstrapping) {
926 sources += [ 920 sources += [
927 "local_discovery/wifi/mock_wifi_manager.cc", 921 "local_discovery/wifi/mock_wifi_manager.cc",
928 "local_discovery/wifi/mock_wifi_manager.h", 922 "local_discovery/wifi/mock_wifi_manager.h",
929 ] 923 ]
930 } 924 }
931 } 925 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698