diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 20:43:56 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 20:43:56 +0000 |
| commit | 5af5d85844984cd9f81472f3a95ae14898063aa4 (patch) | |
| tree | e495cdc04ea3de468796295db3197ae3828dfdb3 | |
| parent | 06621fd070ec9cc4075dcec1af1cca1aa3548dba (diff) | |
| download | chromium_src-5af5d85844984cd9f81472f3a95ae14898063aa4.zip chromium_src-5af5d85844984cd9f81472f3a95ae14898063aa4.tar.gz chromium_src-5af5d85844984cd9f81472f3a95ae14898063aa4.tar.bz2 | |
Update Breakpad to r819 to remove its OpenSSL libcrypto dependency.
BUG=90665
TEST=otool -L '/Applications/Google Chrome Canary.app/Contents/Versions/14.0.837.0/Google Chrome Framework.framework/Google Chrome Framework' | grep libcrypto
should not show any output once this is fixed. You must run this on an
official build such as a canary. Unofficial builds do not include Breakpad
and thus should not show this library.
Review URL: http://codereview.chromium.org/7477046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94352 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 6 |
2 files changed, 3 insertions, 5 deletions
@@ -29,7 +29,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@786", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@819", "src/build/util/support": "/trunk/deps/support@20411", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 66ddc68..9c37fd7 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -40,10 +40,8 @@ 'src/common/mac/SimpleStringDictionary.mm', 'src/common/string_conversion.cc', 'src/common/mac/string_utilities.cc', + 'src/common/md5.c', ], - 'link_settings': { - 'libraries': ['$(SDKROOT)/usr/lib/libcrypto.dylib'], - } }, { 'target_name': 'crash_inspector', @@ -127,6 +125,7 @@ 'src/common/stabs_reader.cc', 'src/common/stabs_to_module.cc', 'src/tools/mac/dump_syms/dump_syms_tool.mm', + 'src/common/md5.c', ], 'defines': [ # For src/common/stabs_reader.h. @@ -141,7 +140,6 @@ 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/usr/lib/libcrypto.dylib', ], }, 'configurations': { |