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

Side by Side Diff: components/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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 import("//tools/grit/repack.gni") 8 import("//tools/grit/repack.gni")
9 9
10 if (is_android) { 10 if (is_android) {
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 489
490 if (enable_rlz_support) { 490 if (enable_rlz_support) {
491 deps += [ "//components/rlz:unit_tests" ] 491 deps += [ "//components/rlz:unit_tests" ]
492 } 492 }
493 if (is_android) { 493 if (is_android) {
494 isolate_file = "components_unittests.isolate" 494 isolate_file = "components_unittests.isolate"
495 495
496 deps += [ "//content/public/android:content_java" ] 496 deps += [ "//content/public/android:content_java" ]
497 deps -= [ "//components/gcm_driver/instance_id:unit_tests" ] 497 deps -= [ "//components/gcm_driver/instance_id:unit_tests" ]
498 498
499 apk_deps = [ 499 deps += [
tfarina 2015/11/20 18:56:06 want to combine this with the above deps list now?
agrieve 2015/11/20 20:06:14 Done.
500 "//components/invalidation/impl:java", 500 "//components/invalidation/impl:java",
501 "//components/safe_json/android:safe_json_java", 501 "//components/safe_json/android:safe_json_java",
502 "//components/signin/core/browser/android:java", 502 "//components/signin/core/browser/android:java",
503 "//components/variations/android:variations_java", 503 "//components/variations/android:variations_java",
504 "//content/public/android:content_java", 504 "//content/public/android:content_java",
505 "//ui/android:ui_java", 505 "//ui/android:ui_java",
506 ] 506 ]
507 507
508 if (enable_configuration_policy) { 508 if (enable_configuration_policy) {
509 apk_deps += [ "//components/policy/android:policy_java" ] 509 deps += [ "//components/policy/android:policy_java" ]
510 } 510 }
511 } 511 }
512 if (is_chromeos) { 512 if (is_chromeos) {
513 deps += [ "//components/ownership:unit_tests" ] 513 deps += [ "//components/ownership:unit_tests" ]
514 } 514 }
515 if (is_chromeos && enable_arc) { 515 if (is_chromeos && enable_arc) {
516 deps += [ "//components/arc:unit_tests" ] 516 deps += [ "//components/arc:unit_tests" ]
517 } 517 }
518 518
519 # TODO(GYP) need this target. 519 # TODO(GYP) need this target.
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 ] 678 ]
679 } 679 }
680 if (is_android) { 680 if (is_android) {
681 sources += [ "test/android/browsertests_apk/components_browser_tests_jni_onl oad.cc" ] 681 sources += [ "test/android/browsertests_apk/components_browser_tests_jni_onl oad.cc" ]
682 sources -= [ "autofill/content/browser/risk/fingerprint_browsertest.cc" ] 682 sources -= [ "autofill/content/browser/risk/fingerprint_browsertest.cc" ]
683 deps += [ "//testing/android/native_test:native_test_support" ] 683 deps += [ "//testing/android/native_test:native_test_support" ]
684 use_default_launcher = false 684 use_default_launcher = false
685 isolate_file = "components_browsertests.isolate" 685 isolate_file = "components_browsertests.isolate"
686 android_manifest = 686 android_manifest =
687 "${target_gen_dir}/components_browsertests_manifest/AndroidManifest.xml" 687 "${target_gen_dir}/components_browsertests_manifest/AndroidManifest.xml"
688 apk_deps = [ 688 deps += [
689 ":components_browsertests_assets", 689 ":components_browsertests_assets",
690 ":components_browsertests_java", 690 ":components_browsertests_java",
691 ":components_browsertests_manifest", 691 ":components_browsertests_manifest",
692 ] 692 ]
693 } 693 }
694 694
695 if (is_linux) { 695 if (is_linux) {
696 # content_extractor_browsertest is a standalone content extraction tool buil t as 696 # content_extractor_browsertest is a standalone content extraction tool buil t as
697 # a MANUAL component_browsertest. 697 # a MANUAL component_browsertest.
698 sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ] 698 sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ]
(...skipping 26 matching lines...) Expand all
725 ] 725 ]
726 if (!is_ios) { 726 if (!is_ios) {
727 deps += [ 727 deps += [
728 "//base", 728 "//base",
729 "//base/test:test_support_perf", 729 "//base/test:test_support_perf",
730 "//components/visitedlink/browser", 730 "//components/visitedlink/browser",
731 "//content/test:test_support", 731 "//content/test:test_support",
732 ] 732 ]
733 } 733 }
734 } 734 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698