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

Side by Side Diff: chrome/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 | « base/BUILD.gn ('k') | components/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/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/chrome_tests.gni") 10 import("//chrome/chrome_tests.gni")
(...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1638 "//ui/gl", 1638 "//ui/gl",
1639 "//v8", 1639 "//v8",
1640 ] 1640 ]
1641 } 1641 }
1642 1642
1643 if (is_android) { 1643 if (is_android) {
1644 sources += rebase_path( 1644 sources += rebase_path(
1645 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s, 1645 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s,
1646 ".", 1646 ".",
1647 "//chrome") 1647 "//chrome")
1648 deps += [
1649 ":unit_tests_java",
1650 "//v8:v8_external_startup_data_assets",
1651 ]
1648 deps -= [ "//third_party/libaddressinput" ] 1652 deps -= [ "//third_party/libaddressinput" ]
1649 1653
1650 android_manifest = 1654 android_manifest =
1651 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml" 1655 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
1652 apk_deps = [
1653 ":unit_tests_java",
1654 "//v8:v8_external_startup_data_assets",
1655 ]
1656 isolate_file = "../unit_tests.isolate" 1656 isolate_file = "../unit_tests.isolate"
1657 1657
1658 # Some android targets still depend on --gc-sections to link. 1658 # Some android targets still depend on --gc-sections to link.
1659 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 1659 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
1660 ldflags = [ "-Wl,--gc-sections" ] 1660 ldflags = [ "-Wl,--gc-sections" ]
1661 } else { 1661 } else {
1662 sources += rebase_path( 1662 sources += rebase_path(
1663 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources, 1663 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources,
1664 ".", 1664 ".",
1665 "//chrome") 1665 "//chrome")
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
2233 if (is_android) { 2233 if (is_android) {
2234 android_library("unit_tests_java") { 2234 android_library("unit_tests_java") {
2235 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2235 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2236 deps = [ 2236 deps = [
2237 "//base:base_java", 2237 "//base:base_java",
2238 "//chrome/android:chrome_java", 2238 "//chrome/android:chrome_java",
2239 "//content/public/android:content_java", 2239 "//content/public/android:content_java",
2240 ] 2240 ]
2241 } 2241 }
2242 } 2242 }
OLDNEW
« no previous file with comments | « base/BUILD.gn ('k') | components/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698