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

Unified Diff: net/BUILD.gn

Issue 1423633002: GN: Fix up net_unittests to match GYP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 5 years, 2 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/android/rules.gni ('k') | net/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index bcd593b05cd5fba4cd697eb4edb08d991aa43341..91bf98703bb1c2c50a3b776131554412a5b8e60a 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -26,9 +26,9 @@ gypi_values = exec_script("//build/gypi_to_gn.py",
"scope",
[ "net.gypi" ])
-# Disable Kerberos on ChromeOS, Android, iOS, and Chromecast, at least for now.
+# Disable Kerberos on ChromeOS, iOS, and Chromecast, at least for now.
# It needs configuration (krb5.conf and so on).
-use_kerberos = !is_chromeos && !is_android && !is_ios && !is_chromecast
+use_kerberos = !is_chromeos && !is_ios && !is_chromecast
# The way the cache uses mmap() is inefficient on some Android devices. If
# this flag is set, we hackily avoid using mmap() in the disk cache. We are
@@ -236,6 +236,8 @@ if (!is_nacl) {
"cert/cert_database_openssl.cc",
"cert/cert_verify_proc_openssl.cc",
"cert/test_root_certs_openssl.cc",
+ "http/http_auth_gssapi_posix.cc",
+ "http/http_auth_gssapi_posix.h",
]
}
}
@@ -1196,9 +1198,27 @@ if (is_android) {
sources = [
"android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
"test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
+ "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java",
]
jni_package = "net/test"
}
+
+ _net_unittests_apk_assets_dir = "$root_out_dir/net_unittests_apk/assets"
brettw 2015/10/22 23:57:19 Why bother with this intermediate variable? I'd ju
agrieve 2015/10/23 02:24:16 Because it's used again below: apk_asset_locatio
+
+ copy_ex("copy_net_unittests_apk_assets") {
+ clear_dir = true
+ dest = _net_unittests_apk_assets_dir
+
+ if (v8_use_external_startup_data) {
+ sources = [
+ "$root_out_dir/natives_blob.bin",
+ "$root_out_dir/snapshot_blob.bin",
+ ]
+ deps = [
+ "//v8",
+ ]
+ }
+ }
}
if (is_android || is_linux) {
@@ -1582,10 +1602,18 @@ test("net_unittests") {
}
if (is_android) {
+ apk_deps = [
+ "//base:base_java_unittest_support",
+ "//net/android:net_java",
+ "//net/android:net_javatests",
+ "//net/android:net_java_test_support",
+ "//net/android:net_unittests_apk_resources",
+ ":copy_net_unittests_apk_assets",
+ ]
+ android_manifest = "//net/android/unittest_support/AndroidManifest.xml"
sources -= [
# See bug http://crbug.com/344533.
"disk_cache/blockfile/index_table_v3_unittest.cc",
- "dns/dns_config_service_posix_unittest.cc",
]
deps += [
":net_test_jni_headers",
@@ -1597,6 +1625,7 @@ test("net_unittests") {
set_sources_assignment_filter([])
sources += [ "base/address_tracker_linux_unittest.cc" ]
set_sources_assignment_filter(sources_assignment_filter)
+ apk_asset_location = _net_unittests_apk_assets_dir
isolate_file = "net_unittests.isolate"
}
« no previous file with comments | « build/config/android/rules.gni ('k') | net/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698