diff options
| author | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 07:40:01 +0000 |
|---|---|---|
| committer | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 07:40:01 +0000 |
| commit | 8e853b143c597b0f6ed5995037919cf959730286 (patch) | |
| tree | 787a555b960dd19a7a7de042b87ae023da32f5ef /net | |
| parent | 29f5085f2a361a6d803cc6cc55803d914db8db55 (diff) | |
| download | chromium_src-8e853b143c597b0f6ed5995037919cf959730286.zip chromium_src-8e853b143c597b0f6ed5995037919cf959730286.tar.gz chromium_src-8e853b143c597b0f6ed5995037919cf959730286.tar.bz2 | |
Upstream: Depend on OpenSSL directly instead of via system.gyp
build/android/system.gyp has an extra level of abstraction for openssl
which is currently not really doing anything since we don't yet support
using the system openssl on android. Remove it for now, because this
stops there from being two targets called "ssl" (this one and the one
for linux) - solving some problems with the android build backend for
gyp.
Review URL: https://chromiumcodereview.appspot.com/10332106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/net.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/net.gyp b/net/net.gyp index 84a9421..c92cfc9 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -998,7 +998,7 @@ 'ENABLE_PERSISTENT_SESSION_COOKIES' ], 'dependencies': [ - '../build/android/system.gyp:ssl', + '../third_party/openssl/openssl.gyp:openssl', 'net_java', 'net_jni_headers', ], @@ -1357,7 +1357,7 @@ ], [ 'OS == "android"', { 'dependencies': [ - '../build/android/system.gyp:ssl', + '../third_party/openssl/openssl.gyp:openssl', ], 'sources!': [ 'dns/dns_config_service_posix_unittest.cc', |