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

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: 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/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 1598 matching lines...) Expand 10 before | Expand all | Expand 10 after
1609 1609
1610 if (is_android) { 1610 if (is_android) {
1611 sources += rebase_path( 1611 sources += rebase_path(
1612 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s, 1612 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s,
1613 ".", 1613 ".",
1614 "//chrome") 1614 "//chrome")
1615 deps -= [ "//third_party/libaddressinput" ] 1615 deps -= [ "//third_party/libaddressinput" ]
1616 1616
1617 android_manifest = 1617 android_manifest =
1618 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml" 1618 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
1619 apk_deps = [ 1619 deps += [
tfarina 2015/11/20 18:56:06 put this before deps -= ?
agrieve 2015/11/20 20:06:14 Done.
1620 ":unit_tests_java", 1620 ":unit_tests_java",
1621 "//v8:v8_external_startup_data_assets", 1621 "//v8:v8_external_startup_data_assets",
1622 ] 1622 ]
1623 isolate_file = "../unit_tests.isolate" 1623 isolate_file = "../unit_tests.isolate"
1624 1624
1625 # Some android targets still depend on --gc-sections to link. 1625 # Some android targets still depend on --gc-sections to link.
1626 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 1626 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
1627 ldflags = [ "-Wl,--gc-sections" ] 1627 ldflags = [ "-Wl,--gc-sections" ]
1628 } else { 1628 } else {
1629 sources += rebase_path( 1629 sources += rebase_path(
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
2197 if (is_android) { 2197 if (is_android) {
2198 android_library("unit_tests_java") { 2198 android_library("unit_tests_java") {
2199 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2199 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2200 deps = [ 2200 deps = [
2201 "//base:base_java", 2201 "//base:base_java",
2202 "//chrome/android:chrome_java", 2202 "//chrome/android:chrome_java",
2203 "//content/public/android:content_java", 2203 "//content/public/android:content_java",
2204 ] 2204 ]
2205 } 2205 }
2206 } 2206 }
OLDNEW
« no previous file with comments | « base/BUILD.gn ('k') | components/BUILD.gn » ('j') | components/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698