summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-24 01:34:41 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-24 01:34:41 +0000
commitb47feba236493f2e541d27e728f8978841353733 (patch)
treef6717d00ec3d9d598562fa46febe234e9f8e7321 /build
parent774d5f4c12771c3e5c439f74560be308e2e3fc34 (diff)
downloadchromium_src-b47feba236493f2e541d27e728f8978841353733.zip
chromium_src-b47feba236493f2e541d27e728f8978841353733.tar.gz
chromium_src-b47feba236493f2e541d27e728f8978841353733.tar.bz2
Update net/android/network_library.cc with fresher code.
Also adds it to the build to ensure it doesn't suffer bit-rot again, and include Java-side component. Review URL: http://codereview.chromium.org/10171009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/android/gtest_filter/net_unittests_disabled3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/android/gtest_filter/net_unittests_disabled b/build/android/gtest_filter/net_unittests_disabled
index 3dde566..d4e583c 100644
--- a/build/android/gtest_filter/net_unittests_disabled
+++ b/build/android/gtest_filter/net_unittests_disabled
@@ -85,3 +85,6 @@ CertVerifyProcTest.*
VerifyRoot/CertVerifyProcWeakDigestTest.*
# Relies on TestServer which isn't yet configured upstream.
URLRequestContextBuilderTest.*
+
+# Depends on JNI for certificate code.
+DiskCacheEntryTest.*