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 import("//build/module_args/v8.gni") | 8 import("//build/module_args/v8.gni") |
| 9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
| 10 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") | 10 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 384 | 384 |
| 385 if (use_aura && !is_win) { | 385 if (use_aura && !is_win) { |
| 386 deps += [ "//ui/events:test_support" ] | 386 deps += [ "//ui/events:test_support" ] |
| 387 } | 387 } |
| 388 | 388 |
| 389 if (!use_aura && !is_mac) { | 389 if (!use_aura && !is_mac) { |
| 390 sources -= | 390 sources -= |
| 391 [ "../browser/compositor/image_transport_factory_browsertest.cc" ] | 391 [ "../browser/compositor/image_transport_factory_browsertest.cc" ] |
| 392 } | 392 } |
| 393 | 393 |
| 394 if (use_aura && !is_win) { | |
| 395 sources -= [ "../browser/plugin_browsertest.cc" ] | |
| 396 } | |
| 397 | |
| 394 if (!is_android && !is_ios && !is_linux) { | 398 if (!is_android && !is_ios && !is_linux) { |
| 395 # Npapi test plugin doesn't build on Android or iOS. | 399 # Npapi test plugin doesn't build on Android or iOS. |
| 396 #data_deps += [ 'copy_npapi_test_plugin' ] TODO(GYP) | 400 #data_deps += [ 'copy_npapi_test_plugin' ] TODO(GYP) |
| 397 } | 401 } |
| 398 | 402 |
| 399 if (enable_webrtc) { | 403 if (enable_webrtc) { |
| 400 sources += rebase_path( | 404 sources += rebase_path( |
| 401 content_tests_gypi_values.content_browsertests_webrtc_sources, | 405 content_tests_gypi_values.content_browsertests_webrtc_sources, |
| 402 ".", | 406 ".", |
| 403 "//content") | 407 "//content") |
| 404 deps += [ "//testing/perf" ] | 408 deps += [ "//testing/perf" ] |
| 405 } | 409 } |
| 406 | 410 |
| 407 if (enable_plugins) { | 411 if (enable_plugins) { |
| 408 sources += rebase_path( | 412 sources += rebase_path( |
| 409 content_tests_gypi_values.content_browsertests_plugins_sources, | 413 content_tests_gypi_values.content_browsertests_plugins_sources, |
| 410 ".", | 414 ".", |
| 411 "//content") | 415 "//content") |
| 412 #deps += [ "//ppapi:ppapi_tests" ] # TODO(GYP) | 416 deps += [ "//ppapi:ppapi_tests" ] |
|
brettw
2015/02/25 16:40:38
Can you make this data_deps instead? This is reall
jam
2015/02/25 16:55:24
Done.
| |
| 413 } | 417 } |
| 414 | 418 |
| 415 if (enable_web_speech) { | 419 if (enable_web_speech) { |
| 416 sources += rebase_path( | 420 sources += rebase_path( |
| 417 content_tests_gypi_values.content_browsertests_speech_sources, | 421 content_tests_gypi_values.content_browsertests_speech_sources, |
| 418 ".", | 422 ".", |
| 419 "//content") | 423 "//content") |
| 420 } | 424 } |
| 421 | 425 |
| 422 if (!is_chrome_branded) { | 426 if (!is_chrome_branded) { |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 696 "//content/public/common", | 700 "//content/public/common", |
| 697 "//testing/gtest", | 701 "//testing/gtest", |
| 698 "//third_party/WebKit/public:blink", | 702 "//third_party/WebKit/public:blink", |
| 699 "//ui/base", | 703 "//ui/base", |
| 700 "//ui/gfx", | 704 "//ui/gfx", |
| 701 "//ui/gfx/geometry", | 705 "//ui/gfx/geometry", |
| 702 "//ui/gl", | 706 "//ui/gl", |
| 703 ] | 707 ] |
| 704 } | 708 } |
| 705 } | 709 } |
| OLD | NEW |