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

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: 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 (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 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after
1590 # OS is not "linux" or "freebsd" or "openbsd". 1590 # OS is not "linux" or "freebsd" or "openbsd".
1591 "socket/unix_domain_client_socket_posix_unittest.cc", 1591 "socket/unix_domain_client_socket_posix_unittest.cc",
1592 "socket/unix_domain_server_socket_posix_unittest.cc", 1592 "socket/unix_domain_server_socket_posix_unittest.cc",
1593 1593
1594 # See bug http://crbug.com/344533. 1594 # See bug http://crbug.com/344533.
1595 "disk_cache/blockfile/index_table_v3_unittest.cc", 1595 "disk_cache/blockfile/index_table_v3_unittest.cc",
1596 ] 1596 ]
1597 } 1597 }
1598 1598
1599 if (is_android) { 1599 if (is_android) {
1600 apk_deps = [ 1600 deps += [
1601 "//base:base_java_unittest_support", 1601 "//base:base_java_unittest_support",
1602 "//net/android:net_java", 1602 "//net/android:net_java",
1603 "//net/android:net_java_test_support",
1603 "//net/android:net_javatests", 1604 "//net/android:net_javatests",
1604 "//net/android:net_java_test_support",
1605 "//net/android:net_unittests_apk_resources", 1605 "//net/android:net_unittests_apk_resources",
1606 "//v8:v8_external_startup_data_assets", 1606 "//v8:v8_external_startup_data_assets",
1607 ] 1607 ]
1608 android_manifest = "//net/android/unittest_support/AndroidManifest.xml" 1608 android_manifest = "//net/android/unittest_support/AndroidManifest.xml"
1609 sources -= [ 1609 sources -= [
1610 # See bug http://crbug.com/344533. 1610 # See bug http://crbug.com/344533.
1611 "disk_cache/blockfile/index_table_v3_unittest.cc", 1611 "disk_cache/blockfile/index_table_v3_unittest.cc",
1612 ] 1612 ]
1613 deps += [ 1613 deps += [
tfarina 2015/11/20 18:56:06 can you combine this now with the above deps list?
agrieve 2015/11/20 20:06:14 Done.
1614 ":net_test_jni_headers", 1614 ":net_test_jni_headers",
1615 1615
1616 # TODO(mmenke): This depends on test_support_base, which depends on 1616 # TODO(mmenke): This depends on test_support_base, which depends on
1617 # icu. Figure out a way to remove that dependency. 1617 # icu. Figure out a way to remove that dependency.
1618 "//testing/android/native_test:native_test_native_code", 1618 "//testing/android/native_test:native_test_native_code",
1619 ] 1619 ]
1620 set_sources_assignment_filter([]) 1620 set_sources_assignment_filter([])
1621 sources += [ "base/address_tracker_linux_unittest.cc" ] 1621 sources += [ "base/address_tracker_linux_unittest.cc" ]
1622 set_sources_assignment_filter(sources_assignment_filter) 1622 set_sources_assignment_filter(sources_assignment_filter)
1623 isolate_file = "net_unittests.isolate" 1623 isolate_file = "net_unittests.isolate"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1663 if (enable_websockets) { 1663 if (enable_websockets) {
1664 sources += [ "websockets/websocket_frame_perftest.cc" ] 1664 sources += [ "websockets/websocket_frame_perftest.cc" ]
1665 } 1665 }
1666 1666
1667 if (use_v8_in_net) { 1667 if (use_v8_in_net) {
1668 deps += [ ":net_with_v8" ] 1668 deps += [ ":net_with_v8" ]
1669 } else { 1669 } else {
1670 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1670 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1671 } 1671 }
1672 } 1672 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698