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

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: rebased on formatting change Created 5 years, 1 month 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
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 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
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" ] 444 deps -= [ "//device/battery" ]
445 deps += [ 445 deps += [
446 "//content/shell:content_shell_lib", 446 "//content/shell:content_shell_lib",
447 "//content/shell/android:content_shell_jni_headers", 447 "//content/shell/android:content_shell_jni_headers",
448 "//testing/android/native_test:native_test_support", 448 "//testing/android/native_test:native_test_support",
449 ] 449 ]
450 apk_deps = [ 450 deps += [
tfarina 2015/11/20 18:56:06 merge with the above list now?
agrieve 2015/11/20 20:06:14 Done.
451 ":content_browsertests_java", 451 ":content_browsertests_java",
452 ":content_browsertests_manifest", 452 ":content_browsertests_manifest",
453 "//content/shell/android:content_shell_assets", 453 "//content/shell/android:content_shell_assets",
454 ] 454 ]
455 android_manifest = 455 android_manifest =
456 "${target_gen_dir}/content_browsertests_manifest/AndroidManifest.xml" 456 "${target_gen_dir}/content_browsertests_manifest/AndroidManifest.xml"
457 isolate_file = "//content/content_browsertests.isolate" 457 isolate_file = "//content/content_browsertests.isolate"
458 458
459 use_default_launcher = false 459 use_default_launcher = false
460 } 460 }
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 "//content") 701 "//content")
702 sources -= [ 702 sources -= [
703 "../browser/geolocation/network_location_provider_unittest.cc", 703 "../browser/geolocation/network_location_provider_unittest.cc",
704 "../browser/geolocation/wifi_data_provider_common_unittest.cc", 704 "../browser/geolocation/wifi_data_provider_common_unittest.cc",
705 "../browser/power_usage_monitor_impl_unittest.cc", 705 "../browser/power_usage_monitor_impl_unittest.cc",
706 "../browser/renderer_host/begin_frame_observer_proxy_unittest.cc", 706 "../browser/renderer_host/begin_frame_observer_proxy_unittest.cc",
707 "../browser/webui/url_data_manager_backend_unittest.cc", 707 "../browser/webui/url_data_manager_backend_unittest.cc",
708 ] 708 ]
709 deps -= [ "//device/battery" ] 709 deps -= [ "//device/battery" ]
710 710
711 apk_deps = [ 711 deps += [
712 "//base:base_java_unittest_support", 712 "//base:base_java_unittest_support",
713 "//content/public/android:content_java", 713 "//content/public/android:content_java",
714 "//v8:v8_external_startup_data_assets", 714 "//v8:v8_external_startup_data_assets",
715 ] 715 ]
716 716
717 defines += [ "APPCACHE_USE_SIMPLE_CACHE" ] 717 defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
718 } 718 }
719 if (!is_android && !is_ios) { 719 if (!is_android && !is_ios) {
720 deps += [ "//third_party/libvpx_new" ] 720 deps += [ "//third_party/libvpx_new" ]
721 } 721 }
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 "//ui/base", 823 "//ui/base",
824 "//ui/gfx", 824 "//ui/gfx",
825 "//ui/gfx:test_support", 825 "//ui/gfx:test_support",
826 "//ui/gfx/geometry", 826 "//ui/gfx/geometry",
827 "//ui/gl", 827 "//ui/gl",
828 "//ui/gl:test_support", 828 "//ui/gl:test_support",
829 "//v8", 829 "//v8",
830 ] 830 ]
831 831
832 if (is_android) { 832 if (is_android) {
833 apk_deps = [ 833 deps += [
834 "//content/public/test/android:content_java_test_support", 834 "//content/public/test/android:content_java_test_support",
835 "//content/shell/android:content_shell_assets", 835 "//content/shell/android:content_shell_assets",
836 ] 836 ]
837 } else { 837 } else {
838 data_deps = [ 838 data_deps = [
839 "//third_party/ffmpeg", 839 "//third_party/ffmpeg",
840 "//third_party/mesa:osmesa", 840 "//third_party/mesa:osmesa",
841 ] 841 ]
842 } 842 }
843 } 843 }
(...skipping 11 matching lines...) Expand all
855 "//gpu/blink", 855 "//gpu/blink",
856 "//testing/gtest", 856 "//testing/gtest",
857 "//third_party/WebKit/public:blink", 857 "//third_party/WebKit/public:blink",
858 "//ui/base", 858 "//ui/base",
859 "//ui/gfx", 859 "//ui/gfx",
860 "//ui/gfx/geometry", 860 "//ui/gfx/geometry",
861 "//ui/gl", 861 "//ui/gl",
862 "//ui/gl:test_support", 862 "//ui/gl:test_support",
863 ] 863 ]
864 } 864 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698