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

Side by Side Diff: content/test/BUILD.gn

Issue 1465923002: GN: Merge apk_deps and deps in test() template (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for realz this time Created 5 years 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
« no previous file with comments | « components/html_viewer/BUILD.gn ('k') | device/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 [ "../browser/accessibility/dump_accessibility_tree_browsertest.cc" ] 434 [ "../browser/accessibility/dump_accessibility_tree_browsertest.cc" ]
435 } 435 }
436 436
437 if (is_android) { 437 if (is_android) {
438 sources += rebase_path( 438 sources += rebase_path(
439 content_tests_gypi_values.content_browsertests_android_sources, 439 content_tests_gypi_values.content_browsertests_android_sources,
440 ".", 440 ".",
441 "//content") 441 "//content")
442 sources -= 442 sources -=
443 [ "../browser/battery_status/battery_monitor_impl_browsertest.cc" ] 443 [ "../browser/battery_status/battery_monitor_impl_browsertest.cc" ]
444 deps -= [ "//device/battery" ]
445 deps += [ 444 deps += [
445 ":content_browsertests_java",
446 ":content_browsertests_manifest",
446 "//content/shell:content_shell_lib", 447 "//content/shell:content_shell_lib",
448 "//content/shell/android:content_shell_assets",
447 "//content/shell/android:content_shell_jni_headers", 449 "//content/shell/android:content_shell_jni_headers",
448 "//testing/android/native_test:native_test_support", 450 "//testing/android/native_test:native_test_support",
449 ] 451 ]
450 apk_deps = [ 452 deps -= [ "//device/battery" ]
451 ":content_browsertests_java",
452 ":content_browsertests_manifest",
453 "//content/shell/android:content_shell_assets",
454 ]
455 android_manifest = 453 android_manifest =
456 "${target_gen_dir}/content_browsertests_manifest/AndroidManifest.xml" 454 "${target_gen_dir}/content_browsertests_manifest/AndroidManifest.xml"
457 isolate_file = "//content/content_browsertests.isolate" 455 isolate_file = "//content/content_browsertests.isolate"
458 456
459 use_default_launcher = false 457 use_default_launcher = false
460 } 458 }
461 459
462 if (is_mac) { 460 if (is_mac) {
463 sources += [ "../renderer/external_popup_menu_browsertest.cc" ] 461 sources += [ "../renderer/external_popup_menu_browsertest.cc" ]
464 deps += [ 462 deps += [
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 "//content") 699 "//content")
702 sources -= [ 700 sources -= [
703 "../browser/geolocation/network_location_provider_unittest.cc", 701 "../browser/geolocation/network_location_provider_unittest.cc",
704 "../browser/geolocation/wifi_data_provider_common_unittest.cc", 702 "../browser/geolocation/wifi_data_provider_common_unittest.cc",
705 "../browser/power_usage_monitor_impl_unittest.cc", 703 "../browser/power_usage_monitor_impl_unittest.cc",
706 "../browser/renderer_host/begin_frame_observer_proxy_unittest.cc", 704 "../browser/renderer_host/begin_frame_observer_proxy_unittest.cc",
707 "../browser/webui/url_data_manager_backend_unittest.cc", 705 "../browser/webui/url_data_manager_backend_unittest.cc",
708 ] 706 ]
709 deps -= [ "//device/battery" ] 707 deps -= [ "//device/battery" ]
710 708
711 apk_deps = [ 709 deps += [
712 "//base:base_java_unittest_support", 710 "//base:base_java_unittest_support",
713 "//content/public/android:content_java", 711 "//content/public/android:content_java",
714 "//v8:v8_external_startup_data_assets", 712 "//v8:v8_external_startup_data_assets",
715 ] 713 ]
716 714
717 defines += [ "APPCACHE_USE_SIMPLE_CACHE" ] 715 defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
718 } 716 }
719 if (!is_android && !is_ios) { 717 if (!is_android && !is_ios) {
720 deps += [ "//third_party/libvpx_new" ] 718 deps += [ "//third_party/libvpx_new" ]
721 } 719 }
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 "//ui/base", 821 "//ui/base",
824 "//ui/gfx", 822 "//ui/gfx",
825 "//ui/gfx:test_support", 823 "//ui/gfx:test_support",
826 "//ui/gfx/geometry", 824 "//ui/gfx/geometry",
827 "//ui/gl", 825 "//ui/gl",
828 "//ui/gl:test_support", 826 "//ui/gl:test_support",
829 "//v8", 827 "//v8",
830 ] 828 ]
831 829
832 if (is_android) { 830 if (is_android) {
833 apk_deps = [ 831 deps += [
834 "//content/public/test/android:content_java_test_support", 832 "//content/public/test/android:content_java_test_support",
835 "//content/shell/android:content_shell_assets", 833 "//content/shell/android:content_shell_assets",
836 ] 834 ]
837 } else { 835 } else {
838 data_deps = [ 836 data_deps = [
839 "//third_party/ffmpeg", 837 "//third_party/ffmpeg",
840 "//third_party/mesa:osmesa", 838 "//third_party/mesa:osmesa",
841 ] 839 ]
842 } 840 }
843 } 841 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 "//content/common/gpu/media/rendering_helper.cc", 887 "//content/common/gpu/media/rendering_helper.cc",
890 "//content/common/gpu/media/rendering_helper.h", 888 "//content/common/gpu/media/rendering_helper.h",
891 "//content/common/gpu/media/video_decode_accelerator_unittest.cc", 889 "//content/common/gpu/media/video_decode_accelerator_unittest.cc",
892 ] 890 ]
893 } 891 }
894 892
895 if (is_android) { 893 if (is_android) {
896 deps += [ 894 deps += [
897 "//gpu:test_support", 895 "//gpu:test_support",
898 "//media/base/android", 896 "//media/base/android",
897 "//media/base/android:media_java",
899 "//testing/gmock", 898 "//testing/gmock",
900 ]
901 apk_deps = [
902 "//media/base/android:media_java",
903 "//ui/android:ui_java", 899 "//ui/android:ui_java",
904 ] 900 ]
905 } 901 }
906 } 902 }
907 } 903 }
OLDNEW
« no previous file with comments | « components/html_viewer/BUILD.gn ('k') | device/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698