| 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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 "//third_party/mojo/src/mojo/public/js", | 271 "//third_party/mojo/src/mojo/public/js", |
| 272 "//third_party/npapi", | 272 "//third_party/npapi", |
| 273 "//third_party/re2", | 273 "//third_party/re2", |
| 274 "//third_party/smhasher:cityhash", | 274 "//third_party/smhasher:cityhash", |
| 275 "//third_party/webrtc/modules/desktop_capture", | 275 "//third_party/webrtc/modules/desktop_capture", |
| 276 "//ui/base/ime", | 276 "//ui/base/ime", |
| 277 "//ui/gl", | 277 "//ui/gl", |
| 278 "//ui/surface", | 278 "//ui/surface", |
| 279 "//ui/web_dialogs", | 279 "//ui/web_dialogs", |
| 280 "//v8", | 280 "//v8", |
| 281 | |
| 282 ## TODO(tonyg): Remove this dependency (crbug.com/280157). | |
| 283 "//testing/perf", | |
| 284 ] | 281 ] |
| 285 } else { # iOS | 282 } else { # iOS |
| 286 sources += | 283 sources += |
| 287 rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome") | 284 rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome") |
| 288 sources += | 285 sources += |
| 289 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") | 286 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") |
| 290 deps += [ "//net" ] | 287 deps += [ "//net" ] |
| 291 libs += [ | 288 libs += [ |
| 292 "CoreTelephony.framework", | 289 "CoreTelephony.framework", |
| 293 "CoreText.framework", | 290 "CoreText.framework", |
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1112 ] | 1109 ] |
| 1113 } | 1110 } |
| 1114 | 1111 |
| 1115 if (enable_wifi_bootstrapping) { | 1112 if (enable_wifi_bootstrapping) { |
| 1116 sources += [ | 1113 sources += [ |
| 1117 "local_discovery/wifi/mock_wifi_manager.cc", | 1114 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1118 "local_discovery/wifi/mock_wifi_manager.h", | 1115 "local_discovery/wifi/mock_wifi_manager.h", |
| 1119 ] | 1116 ] |
| 1120 } | 1117 } |
| 1121 } | 1118 } |
| OLD | NEW |