net/net.gyp - Issue 11316210: Implement TestRootCerts for Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/net.gyp

Issue 11316210: Implement TestRootCerts for Android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: remove an obsolete findbugs suppression Created 8 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:

Index: net/net.gyp

diff --git a/net/net.gyp b/net/net.gyp

index 795f6278c7eee18e3395d3a719f40cec17a85d5c..d62d8079f3356d895b0d27739258372cbe6c2e58 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -274,6 +274,7 @@

'base/test_root_certs_mac.cc',

'base/test_root_certs_nss.cc',

'base/test_root_certs_openssl.cc',

+ 'base/test_root_certs_android.cc',

'base/test_root_certs_win.cc',

'base/transport_security_state.cc',

'base/transport_security_state.h',

@@ -1194,8 +1195,9 @@

'sources!': [

'base/openssl_memory_private_key_store.cc',

+ 'base/test_root_certs_openssl.cc',

- }, { # else OS! = "android"

+ }, { # else OS != "android"

'defines': [

# These are the features Android doesn't support.

'ENABLE_MEDIA_CODEC_THEORA',

« net/base/test_root_certs.h ('K') | « net/base/test_root_certs_android.cc ('k') | no next file » | no next file with comments »