diff options
| author | zhurunz@google.com <zhurunz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 18:45:38 +0000 |
|---|---|---|
| committer | zhurunz@google.com <zhurunz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 18:45:38 +0000 |
| commit | 3aaab9917e8d5386e817973185ca165823f3b46b (patch) | |
| tree | 832cddf20bdb37cdb4d8e55076eff23705db6b63 /o3d | |
| parent | d519bed65cbdb8ba820af89ec3fb3ec7f77cbad0 (diff) | |
| download | chromium_src-3aaab9917e8d5386e817973185ca165823f3b46b.zip chromium_src-3aaab9917e8d5386e817973185ca165823f3b46b.tar.gz chromium_src-3aaab9917e8d5386e817973185ca165823f3b46b.tar.bz2 | |
Sync to latest breakpad which doesn't have deps on libglog.
Review URL: http://codereview.chromium.org/2354001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/DEPS | 2 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 9 |
2 files changed, 1 insertions, 10 deletions
@@ -10,7 +10,7 @@ vars = { "gyp_rev": "820", "gtest_rev": "359", "gflags_rev": "30", - "breakpad_rev": "603", + "breakpad_rev": "604", "v8_rev": "3608", "nacl_rev": "1434", } diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 503994f..746f892 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -302,15 +302,6 @@ '<!@(pkg-config --libs-only-l xt)', ], 'conditions' : [ - ['target_arch=="ia32"', - { # Used by breakpad - # TODO(zhurunz) Remove the deps on libglog.a - 'libraries': [ - '-Lbreakpad/src/third_party/linux/lib/glog', - '-lglog', - ], - }, - ], ['plugin_rpath != ""', { 'ldflags': [ |