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

Side by Side Diff: base/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 | « no previous file | chrome/test/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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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/compiler/compiler.gni") 5 import("//build/config/compiler/compiler.gni")
6 import("//build/config/nacl/config.gni") 6 import("//build/config/nacl/config.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 if (is_android) { 10 if (is_android) {
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after
1518 "test/data/", 1518 "test/data/",
1519 ] 1519 ]
1520 1520
1521 # Allow more direct string conversions on platforms with native utf8 1521 # Allow more direct string conversions on platforms with native utf8
1522 # strings 1522 # strings
1523 if (is_mac || is_ios || is_chromeos) { 1523 if (is_mac || is_ios || is_chromeos) {
1524 defines = [ "SYSTEM_NATIVE_UTF8" ] 1524 defines = [ "SYSTEM_NATIVE_UTF8" ]
1525 } 1525 }
1526 1526
1527 if (is_android) { 1527 if (is_android) {
1528 apk_deps = [ 1528 deps += [
1529 ":base_java", 1529 ":base_java",
1530 ":base_java_unittest_support", 1530 ":base_java_unittest_support",
1531 ] 1531 ]
1532 1532
1533 # TODO(brettw) I think this should not be here, we should not be using 1533 # TODO(brettw) I think this should not be here, we should not be using
1534 # isolate files. 1534 # isolate files.
1535 isolate_file = "base_unittests.isolate" 1535 isolate_file = "base_unittests.isolate"
1536 } 1536 }
1537 1537
1538 if (is_ios) { 1538 if (is_ios) {
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 1750
1751 # GYP: //base.gyp:base_java_unittest_support 1751 # GYP: //base.gyp:base_java_unittest_support
1752 android_library("base_java_unittest_support") { 1752 android_library("base_java_unittest_support") {
1753 deps = [ 1753 deps = [
1754 ":base_java", 1754 ":base_java",
1755 ] 1755 ]
1756 java_files = 1756 java_files =
1757 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1757 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1758 } 1758 }
1759 } 1759 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698