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

Side by Side Diff: net/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 | « media/midi/BUILD.gn ('k') | remoting/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/chromecast_build.gni") 5 import("//build/config/chromecast_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("//build_overrides/v8.gni") 10 import("//build_overrides/v8.gni")
(...skipping 1580 matching lines...) Expand 10 before | Expand all | Expand 10 after
1591 # OS is not "linux" or "freebsd" or "openbsd". 1591 # OS is not "linux" or "freebsd" or "openbsd".
1592 "socket/unix_domain_client_socket_posix_unittest.cc", 1592 "socket/unix_domain_client_socket_posix_unittest.cc",
1593 "socket/unix_domain_server_socket_posix_unittest.cc", 1593 "socket/unix_domain_server_socket_posix_unittest.cc",
1594 1594
1595 # See bug http://crbug.com/344533. 1595 # See bug http://crbug.com/344533.
1596 "disk_cache/blockfile/index_table_v3_unittest.cc", 1596 "disk_cache/blockfile/index_table_v3_unittest.cc",
1597 ] 1597 ]
1598 } 1598 }
1599 1599
1600 if (is_android) { 1600 if (is_android) {
1601 apk_deps = [ 1601 deps += [
1602 ":net_test_jni_headers",
1602 "//base:base_java_unittest_support", 1603 "//base:base_java_unittest_support",
1603 "//net/android:net_java", 1604 "//net/android:net_java",
1605 "//net/android:net_java_test_support",
1604 "//net/android:net_javatests", 1606 "//net/android:net_javatests",
1605 "//net/android:net_java_test_support",
1606 "//net/android:net_unittests_apk_resources", 1607 "//net/android:net_unittests_apk_resources",
1608
1609 # TODO(mmenke): This depends on test_support_base, which depends on
1610 # icu. Figure out a way to remove that dependency.
1611 "//testing/android/native_test:native_test_native_code",
1607 "//v8:v8_external_startup_data_assets", 1612 "//v8:v8_external_startup_data_assets",
1608 ] 1613 ]
1609 android_manifest = "//net/android/unittest_support/AndroidManifest.xml" 1614 android_manifest = "//net/android/unittest_support/AndroidManifest.xml"
1610 sources -= [ 1615 sources -= [
1611 # See bug http://crbug.com/344533. 1616 # See bug http://crbug.com/344533.
1612 "disk_cache/blockfile/index_table_v3_unittest.cc", 1617 "disk_cache/blockfile/index_table_v3_unittest.cc",
1613 ] 1618 ]
1614 deps += [
1615 ":net_test_jni_headers",
1616
1617 # TODO(mmenke): This depends on test_support_base, which depends on
1618 # icu. Figure out a way to remove that dependency.
1619 "//testing/android/native_test:native_test_native_code",
1620 ]
1621 set_sources_assignment_filter([]) 1619 set_sources_assignment_filter([])
1622 sources += [ "base/address_tracker_linux_unittest.cc" ] 1620 sources += [ "base/address_tracker_linux_unittest.cc" ]
1623 set_sources_assignment_filter(sources_assignment_filter) 1621 set_sources_assignment_filter(sources_assignment_filter)
1624 isolate_file = "net_unittests.isolate" 1622 isolate_file = "net_unittests.isolate"
1625 } 1623 }
1626 1624
1627 # Symbols for crashes when running tests on swarming. 1625 # Symbols for crashes when running tests on swarming.
1628 if (symbol_level > 0) { 1626 if (symbol_level > 0) {
1629 if (is_win) { 1627 if (is_win) {
1630 data += [ "$root_out_dir/net_unittests.exe.pdb" ] 1628 data += [ "$root_out_dir/net_unittests.exe.pdb" ]
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 if (enable_websockets) { 1662 if (enable_websockets) {
1665 sources += [ "websockets/websocket_frame_perftest.cc" ] 1663 sources += [ "websockets/websocket_frame_perftest.cc" ]
1666 } 1664 }
1667 1665
1668 if (use_v8_in_net) { 1666 if (use_v8_in_net) {
1669 deps += [ ":net_with_v8" ] 1667 deps += [ ":net_with_v8" ]
1670 } else { 1668 } else {
1671 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1669 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1672 } 1670 }
1673 } 1671 }
OLDNEW
« no previous file with comments | « media/midi/BUILD.gn ('k') | remoting/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698