summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2016-03-25 15:59:54 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 23:01:10 +0000
commit7506038f72f014af065b778fa0b57cd2ffe92707 (patch)
tree7ab27217c879cd7a96f67b7f83ee92cedbfe420e
parentd4f9028b7caa77e2e034fa8fc728382d74a592ea (diff)
downloadchromium_src-7506038f72f014af065b778fa0b57cd2ffe92707.zip
chromium_src-7506038f72f014af065b778fa0b57cd2ffe92707.tar.gz
chromium_src-7506038f72f014af065b778fa0b57cd2ffe92707.tar.bz2
Revert of Adding nist-pkits data files for iOS OpenSSL (patchset #1 id:1 of https://codereview.chromium.org/1832203002/ )
Reason for revert: Reverting on behalf of svaldez. It's breaking something. Original issue's description: > Adding nist-pkits data files for iOS OpenSSL > > BUG= > > Committed: https://crrev.com/d4495227c6df738b6361994e984f84fa9adc802f > Cr-Commit-Position: refs/heads/master@{#383391} TBR=svaldez@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/1839493002 Cr-Commit-Position: refs/heads/master@{#383393}
-rw-r--r--net/BUILD.gn2
-rw-r--r--net/net.gyp2
2 files changed, 1 insertions, 3 deletions
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 550d3b3..6fd7fc7 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1448,7 +1448,7 @@ test("net_unittests") {
]
data_deps = []
- if (use_openssl) {
+ if (!is_ios) {
data_deps += [ "third_party/nist-pkits/" ]
}
diff --git a/net/net.gyp b/net/net.gyp
index 0310470..e0df0b3 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -372,8 +372,6 @@
'data/verify_certificate_chain_unittest/',
'data/verify_name_match_unittest/names/',
'data/verify_signed_data_unittest/',
- 'third_party/nist-pkits/certs/',
- 'third_party/nist-pkits/crls/',
],
'test_data_prefix': 'net',
},