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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//build_overrides/v8.gni") | 9 import("//build_overrides/v8.gni") |
| 10 import("//media/media_options.gni") | 10 import("//media/media_options.gni") |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 475 } else { | 475 } else { |
| 476 sources -= [ | 476 sources -= [ |
| 477 "../browser/accessibility/touch_accessibility_aura_browsertest.cc", | 477 "../browser/accessibility/touch_accessibility_aura_browsertest.cc", |
| 478 "../browser/renderer_host/input/touch_selection_controller_client_aura_b rowsertest.cc", | 478 "../browser/renderer_host/input/touch_selection_controller_client_aura_b rowsertest.cc", |
| 479 "../browser/web_contents/web_contents_view_aura_browsertest.cc", | 479 "../browser/web_contents/web_contents_view_aura_browsertest.cc", |
| 480 ] | 480 ] |
| 481 } | 481 } |
| 482 } | 482 } |
| 483 } | 483 } |
| 484 | 484 |
| 485 if (is_android) { | |
| 486 content_unittests_apk_assets_dir = | |
|
agrieve
2015/10/21 01:13:01
nit: prefix non-parameter variables with a _
| |
| 487 "$root_build_dir/content_unittests_apk/assets" | |
| 488 copy_ex("copy_content_unittests_apk_assets") { | |
| 489 clear_dir = true | |
| 490 dest = "$content_unittests_apk_assets_dir" | |
|
agrieve
2015/10/21 01:13:01
nit: no need for ""s
| |
| 491 | |
| 492 if (v8_use_external_startup_data) { | |
| 493 sources = [ | |
| 494 "$root_build_dir/natives_blob.bin", | |
| 495 "$root_build_dir/snapshot_blob.bin", | |
| 496 ] | |
| 497 deps = [ | |
| 498 "//v8", | |
| 499 ] | |
| 500 } | |
| 501 } | |
| 502 } | |
| 503 | |
| 485 # TODO(GYP): Delete this after we've converted everything to GN. | 504 # TODO(GYP): Delete this after we've converted everything to GN. |
| 486 # The _run targets exist only for compatibility w/ GYP. | 505 # The _run targets exist only for compatibility w/ GYP. |
| 487 group("content_unittests_run") { | 506 group("content_unittests_run") { |
| 488 testonly = true | 507 testonly = true |
| 489 deps = [ | 508 deps = [ |
| 490 ":content_unittests", | 509 ":content_unittests", |
| 491 ] | 510 ] |
| 492 } | 511 } |
| 493 | 512 |
| 494 test("content_unittests") { | 513 test("content_unittests") { |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 652 ".", | 671 ".", |
| 653 "//content") | 672 "//content") |
| 654 sources -= [ | 673 sources -= [ |
| 655 "../browser/geolocation/network_location_provider_unittest.cc", | 674 "../browser/geolocation/network_location_provider_unittest.cc", |
| 656 "../browser/geolocation/wifi_data_provider_common_unittest.cc", | 675 "../browser/geolocation/wifi_data_provider_common_unittest.cc", |
| 657 "../browser/power_usage_monitor_impl_unittest.cc", | 676 "../browser/power_usage_monitor_impl_unittest.cc", |
| 658 "../browser/renderer_host/begin_frame_observer_proxy_unittest.cc", | 677 "../browser/renderer_host/begin_frame_observer_proxy_unittest.cc", |
| 659 "../browser/webui/url_data_manager_backend_unittest.cc", | 678 "../browser/webui/url_data_manager_backend_unittest.cc", |
| 660 ] | 679 ] |
| 661 deps -= [ "//device/battery" ] | 680 deps -= [ "//device/battery" ] |
| 662 deps += [ "//testing/android/native_test:native_test_native_code" ] | 681 deps += [ ":copy_content_unittests_apk_assets" ] |
| 682 | |
| 683 apk_asset_location = "$content_unittests_apk_assets_dir" | |
|
agrieve
2015/10/21 01:13:01
nit: drop the "$", just do apk_asset_location = co
| |
| 684 apk_deps = [ | |
| 685 "//base:base_java_unittest_support", | |
| 686 "//content/public/android:content_java", | |
| 687 ] | |
| 663 } | 688 } |
| 664 if (!is_android && !is_ios) { | 689 if (!is_android && !is_ios) { |
| 665 deps += [ "//third_party/libvpx_new" ] | 690 deps += [ "//third_party/libvpx_new" ] |
| 666 } | 691 } |
| 667 | 692 |
| 668 if (use_aura) { | 693 if (use_aura) { |
| 669 deps += [ | 694 deps += [ |
| 670 "//ui/aura", | 695 "//ui/aura", |
| 671 "//ui/aura_extra", | 696 "//ui/aura_extra", |
| 672 "//ui/wm", | 697 "//ui/wm", |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 794 "//testing/gtest", | 819 "//testing/gtest", |
| 795 "//third_party/WebKit/public:blink", | 820 "//third_party/WebKit/public:blink", |
| 796 "//ui/base", | 821 "//ui/base", |
| 797 "//ui/gfx", | 822 "//ui/gfx", |
| 798 "//ui/gfx/geometry", | 823 "//ui/gfx/geometry", |
| 799 "//ui/gl", | 824 "//ui/gl", |
| 800 "//ui/gl:test_support", | 825 "//ui/gl:test_support", |
| 801 ] | 826 ] |
| 802 } | 827 } |
| 803 } | 828 } |
| OLD | NEW |