diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 10:08:40 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 10:08:40 +0000 |
| commit | ea9240f190b750fe5c8f12f267b92661a9d85864 (patch) | |
| tree | a5deedc295ec3855349c69105126cce77a2b947f /net/net.gyp | |
| parent | 7bb761897cda2caf6d4d8b334709a3761f2a07ab (diff) | |
| download | chromium_src-ea9240f190b750fe5c8f12f267b92661a9d85864.zip chromium_src-ea9240f190b750fe5c8f12f267b92661a9d85864.tar.gz chromium_src-ea9240f190b750fe5c8f12f267b92661a9d85864.tar.bz2 | |
Exclude openssl_memory_private_key_store.cc from build on Android.
This is part of Chrome for Android upstreaming.
This lets us remove the last diffs we have internally in net/base/
so that we can completely freeze this directory internally.
BUG=136749
Review URL: https://chromiumcodereview.appspot.com/10790072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 881eeff..a00509a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -902,6 +902,7 @@ 'base/keygen_handler_openssl.cc', 'base/openssl_memory_private_key_store.cc', 'base/openssl_private_key_store.h', + 'base/openssl_private_key_store_android.cc', 'base/test_root_certs_openssl.cc', 'base/x509_certificate_openssl.cc', 'base/x509_util_openssl.cc', @@ -1029,6 +1030,9 @@ '../third_party/openssl/openssl.gyp:openssl', 'net_jni_headers', ], + 'sources!': [ + 'base/openssl_memory_private_key_store.cc', + ], }, { # else OS! = "android" 'defines': [ # These are the features Android doesn't support. |