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

Side by Side Diff: net/BUILD.gn

Issue 1421473010: Replace most uses of asset_location with android_assets() template (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « content/test/BUILD.gn ('k') | third_party/WebKit/Source/platform/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 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after
1201 jni_package = "net" 1201 jni_package = "net"
1202 } 1202 }
1203 generate_jni("net_test_jni_headers") { 1203 generate_jni("net_test_jni_headers") {
1204 sources = [ 1204 sources = [
1205 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java", 1205 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
1206 "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator .java", 1206 "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator .java",
1207 "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java" , 1207 "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java" ,
1208 ] 1208 ]
1209 jni_package = "net/test" 1209 jni_package = "net/test"
1210 } 1210 }
1211
1212 _net_unittests_apk_assets_dir = "$root_out_dir/net_unittests_apk/assets"
1213
1214 copy_ex("copy_net_unittests_apk_assets") {
1215 clear_dir = true
1216 dest = _net_unittests_apk_assets_dir
1217
1218 if (v8_use_external_startup_data) {
1219 renaming_sources = v8_external_startup_data_renaming_sources
1220 renaming_destinations = v8_external_startup_data_renaming_destinations
1221 deps = [
1222 "//v8",
1223 ]
1224 }
1225 }
1226 } 1211 }
1227 1212
1228 if (is_android || is_linux) { 1213 if (is_android || is_linux) {
1229 executable("disk_cache_memory_test") { 1214 executable("disk_cache_memory_test") {
1230 testonly = true 1215 testonly = true
1231 sources = [ 1216 sources = [
1232 "tools/disk_cache_memory_test/disk_cache_memory_test.cc", 1217 "tools/disk_cache_memory_test/disk_cache_memory_test.cc",
1233 ] 1218 ]
1234 deps = [ 1219 deps = [
1235 ":net", 1220 ":net",
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
1609 ] 1594 ]
1610 } 1595 }
1611 1596
1612 if (is_android) { 1597 if (is_android) {
1613 apk_deps = [ 1598 apk_deps = [
1614 "//base:base_java_unittest_support", 1599 "//base:base_java_unittest_support",
1615 "//net/android:net_java", 1600 "//net/android:net_java",
1616 "//net/android:net_javatests", 1601 "//net/android:net_javatests",
1617 "//net/android:net_java_test_support", 1602 "//net/android:net_java_test_support",
1618 "//net/android:net_unittests_apk_resources", 1603 "//net/android:net_unittests_apk_resources",
1619 ":copy_net_unittests_apk_assets", 1604 "//v8:v8_external_startup_data_assets",
1620 ] 1605 ]
1621 android_manifest = "//net/android/unittest_support/AndroidManifest.xml" 1606 android_manifest = "//net/android/unittest_support/AndroidManifest.xml"
1622 sources -= [ 1607 sources -= [
1623 # See bug http://crbug.com/344533. 1608 # See bug http://crbug.com/344533.
1624 "disk_cache/blockfile/index_table_v3_unittest.cc", 1609 "disk_cache/blockfile/index_table_v3_unittest.cc",
1625 ] 1610 ]
1626 deps += [ 1611 deps += [
1627 ":net_test_jni_headers", 1612 ":net_test_jni_headers",
1628 1613
1629 # TODO(mmenke): This depends on test_support_base, which depends on 1614 # TODO(mmenke): This depends on test_support_base, which depends on
1630 # icu. Figure out a way to remove that dependency. 1615 # icu. Figure out a way to remove that dependency.
1631 "//testing/android/native_test:native_test_native_code", 1616 "//testing/android/native_test:native_test_native_code",
1632 ] 1617 ]
1633 set_sources_assignment_filter([]) 1618 set_sources_assignment_filter([])
1634 sources += [ "base/address_tracker_linux_unittest.cc" ] 1619 sources += [ "base/address_tracker_linux_unittest.cc" ]
1635 set_sources_assignment_filter(sources_assignment_filter) 1620 set_sources_assignment_filter(sources_assignment_filter)
1636 apk_asset_location = _net_unittests_apk_assets_dir
1637 isolate_file = "net_unittests.isolate" 1621 isolate_file = "net_unittests.isolate"
1638 } 1622 }
1639 1623
1640 # Symbols for crashes when running tests on swarming. 1624 # Symbols for crashes when running tests on swarming.
1641 if (symbol_level > 0) { 1625 if (symbol_level > 0) {
1642 if (is_win) { 1626 if (is_win) {
1643 data += [ "$root_out_dir/net_unittests.exe.pdb" ] 1627 data += [ "$root_out_dir/net_unittests.exe.pdb" ]
1644 } else if (is_mac) { 1628 } else if (is_mac) {
1645 data += [ "$root_out_dir/net_unittests.dSYM/" ] 1629 data += [ "$root_out_dir/net_unittests.dSYM/" ]
1646 } 1630 }
(...skipping 30 matching lines...) Expand all
1677 if (enable_websockets) { 1661 if (enable_websockets) {
1678 sources += [ "websockets/websocket_frame_perftest.cc" ] 1662 sources += [ "websockets/websocket_frame_perftest.cc" ]
1679 } 1663 }
1680 1664
1681 if (use_v8_in_net) { 1665 if (use_v8_in_net) {
1682 deps += [ ":net_with_v8" ] 1666 deps += [ ":net_with_v8" ]
1683 } else { 1667 } else {
1684 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1668 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1685 } 1669 }
1686 } 1670 }
OLDNEW
« no previous file with comments | « content/test/BUILD.gn ('k') | third_party/WebKit/Source/platform/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698