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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 | 281 |
| 282 ## TODO(tonyg): Remove this dependency (crbug.com/280157). | 282 ## TODO(tonyg): Remove this dependency (crbug.com/280157). |
| 283 #"../testing/perf/perf_test.gyp:*", TODO(GYP) | 283 "//testing/perf", |
|
Nico
2015/02/22 20:19:09
this adds a dep on perf, while the lhs was a dep o
tfarina
2015/02/22 21:18:33
it is the same.
//testing/perf:perf is the GN tar
Dirk Pranke
2015/02/23 18:56:21
tfarina's right, //testing/perf is the GN equivale
| |
| 284 ] | 284 ] |
| 285 } else { # iOS | 285 } else { # iOS |
| 286 sources += | 286 sources += |
| 287 rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome") | 287 rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome") |
| 288 sources += | 288 sources += |
| 289 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") | 289 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") |
| 290 deps += [ "//net" ] | 290 deps += [ "//net" ] |
| 291 libs += [ | 291 libs += [ |
| 292 "CoreTelephony.framework", | 292 "CoreTelephony.framework", |
| 293 "CoreText.framework", | 293 "CoreText.framework", |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 615 "//components/feedback", | 615 "//components/feedback", |
| 616 "//components/storage_monitor", | 616 "//components/storage_monitor", |
| 617 "//components/web_modal", | 617 "//components/web_modal", |
| 618 ] | 618 ] |
| 619 defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] | 619 defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] |
| 620 } | 620 } |
| 621 | 621 |
| 622 if (is_mac) { | 622 if (is_mac) { |
| 623 deps += [ | 623 deps += [ |
| 624 "//third_party/google_toolbox_for_mac", | 624 "//third_party/google_toolbox_for_mac", |
| 625 #"../third_party/mozilla/mozilla.gyp:mozilla", TODO(GYP) | 625 "//third_party/mozilla", |
| 626 ] | 626 ] |
| 627 libs += [ | 627 libs += [ |
| 628 "Accelerate.framework", | 628 "Accelerate.framework", |
| 629 "AddressBook.framework", | 629 "AddressBook.framework", |
| 630 "AudioUnit.framework", | 630 "AudioUnit.framework", |
| 631 "DiskArbitration.framework", | 631 "DiskArbitration.framework", |
| 632 "IOKit.framework", | 632 "IOKit.framework", |
| 633 "ImageCaptureCore.framework", | 633 "ImageCaptureCore.framework", |
| 634 "OpenGL.framework", | 634 "OpenGL.framework", |
| 635 "QuartzCore.framework", | 635 "QuartzCore.framework", |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1112 ] | 1112 ] |
| 1113 } | 1113 } |
| 1114 | 1114 |
| 1115 if (enable_wifi_bootstrapping) { | 1115 if (enable_wifi_bootstrapping) { |
| 1116 sources += [ | 1116 sources += [ |
| 1117 "local_discovery/wifi/mock_wifi_manager.cc", | 1117 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1118 "local_discovery/wifi/mock_wifi_manager.h", | 1118 "local_discovery/wifi/mock_wifi_manager.h", |
| 1119 ] | 1119 ] |
| 1120 } | 1120 } |
| 1121 } | 1121 } |
| OLD | NEW |