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

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: 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 | « chrome/test/BUILD.gn ('k') | components/html_viewer/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/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 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 "//third_party/mesa:osmesa", 483 "//third_party/mesa:osmesa",
484 "//ui/resources:ui_test_pak", 484 "//ui/resources:ui_test_pak",
485 ] 485 ]
486 } # iOS/!iOS 486 } # iOS/!iOS
487 487
488 if (is_android) { 488 if (is_android) {
489 isolate_file = "components_unittests.isolate" 489 isolate_file = "components_unittests.isolate"
490 490
491 deps += [ 491 deps += [
492 "//components/invalidation/impl", 492 "//components/invalidation/impl",
493 "//components/invalidation/impl:java",
493 "//components/safe_json", 494 "//components/safe_json",
495 "//components/safe_json/android:safe_json_java",
494 "//components/signin/core/browser", 496 "//components/signin/core/browser",
497 "//components/signin/core/browser/android:java",
498 "//components/variations/android:variations_java",
499 "//content/public/android:content_java",
495 "//content/public/android:content_java", 500 "//content/public/android:content_java",
496 "//content/public/browser", 501 "//content/public/browser",
497 "//net", 502 "//net",
503 "//ui/android:ui_java",
498 "//ui/base", 504 "//ui/base",
499 "//ui/gfx", 505 "//ui/gfx",
500 ] 506 ]
501 507
502 apk_deps = [
503 "//components/invalidation/impl:java",
504 "//components/safe_json/android:safe_json_java",
505 "//components/signin/core/browser/android:java",
506 "//components/variations/android:variations_java",
507 "//content/public/android:content_java",
508 "//ui/android:ui_java",
509 ]
510
511 if (enable_configuration_policy) { 508 if (enable_configuration_policy) {
512 apk_deps += [ "//components/policy/android:policy_java" ] 509 deps += [ "//components/policy/android:policy_java" ]
513 } 510 }
514 } 511 }
515 512
516 # Desktop-only deps. 513 # Desktop-only deps.
517 if (!is_android && !is_ios) { 514 if (!is_android && !is_ios) {
518 deps += [ 515 deps += [
519 "//components/audio_modem:unit_tests", 516 "//components/audio_modem:unit_tests",
520 "//components/copresence:unit_tests", 517 "//components/copresence:unit_tests",
521 "//components/feedback:unit_tests", 518 "//components/feedback:unit_tests",
522 "//components/gcm_driver/instance_id:unit_tests", 519 "//components/gcm_driver/instance_id:unit_tests",
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 sources += [ "test/android/browsertests_apk/components_browser_tests_jni_onl oad.cc" ] 692 sources += [ "test/android/browsertests_apk/components_browser_tests_jni_onl oad.cc" ]
696 sources -= [ "autofill/content/browser/risk/fingerprint_browsertest.cc" ] 693 sources -= [ "autofill/content/browser/risk/fingerprint_browsertest.cc" ]
697 deps += [ 694 deps += [
698 "//content/test:layouttest_support", 695 "//content/test:layouttest_support",
699 "//testing/android/native_test:native_test_support", 696 "//testing/android/native_test:native_test_support",
700 ] 697 ]
701 use_default_launcher = false 698 use_default_launcher = false
702 isolate_file = "components_browsertests.isolate" 699 isolate_file = "components_browsertests.isolate"
703 android_manifest = 700 android_manifest =
704 "${target_gen_dir}/components_browsertests_manifest/AndroidManifest.xml" 701 "${target_gen_dir}/components_browsertests_manifest/AndroidManifest.xml"
705 apk_deps = [ 702 deps += [
706 ":components_browsertests_assets", 703 ":components_browsertests_assets",
707 ":components_browsertests_java", 704 ":components_browsertests_java",
708 ":components_browsertests_manifest", 705 ":components_browsertests_manifest",
709 ] 706 ]
710 } 707 }
711 708
712 if (is_linux) { 709 if (is_linux) {
713 # content_extractor_browsertest is a standalone content extraction tool buil t as 710 # content_extractor_browsertest is a standalone content extraction tool buil t as
714 # a MANUAL component_browsertest. 711 # a MANUAL component_browsertest.
715 sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ] 712 sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ]
(...skipping 29 matching lines...) Expand all
745 if (!is_ios) { 742 if (!is_ios) {
746 deps += [ 743 deps += [
747 "//base", 744 "//base",
748 "//base/test:test_support_perf", 745 "//base/test:test_support_perf",
749 "//components/scheduler", 746 "//components/scheduler",
750 "//components/visitedlink/browser", 747 "//components/visitedlink/browser",
751 "//content/test:test_support", 748 "//content/test:test_support",
752 ] 749 ]
753 } 750 }
754 } 751 }
OLDNEW
« no previous file with comments | « chrome/test/BUILD.gn ('k') | components/html_viewer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698