diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 19:04:43 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 19:04:43 +0000 |
commit | 9603fa7f011a3a6fddd9df0f02b92aa1bd279024 (patch) | |
tree | 6df46f42b7acf273f18782f80c5d67e5fe8bb78f /base/base.gypi | |
parent | 43d42d8cf4da8b10d498d98f4c6120063c3df869 (diff) | |
download | chromium_src-9603fa7f011a3a6fddd9df0f02b92aa1bd279024.zip chromium_src-9603fa7f011a3a6fddd9df0f02b92aa1bd279024.tar.gz chromium_src-9603fa7f011a3a6fddd9df0f02b92aa1bd279024.tar.bz2 |
Revert 131593
Speculatively reverting due to gyp update error on official bots:
KeyError: 'src/breakpad/breakpad.gyp:dump_syms#target while trying to load target src/remoting/remoting.gyp:remoting_linux_symbols#target'
This is the only patch in the regression range that touches breakpad.gyp.
---
Upstream Android native crash handling changes.
This is actulaly the second time.
Revert "Revert 131404 - Upstream native crash handling changes for Android."
This reverts commit 421df96aab6267e963ddff16c9f738aa903a2cba.
Conflicts:
chrome/browser/chrome_browser_main.cc
BUG=
TEST=
Review URL: http://codereview.chromium.org/9967017
TBR=carlosvaldivia@google.com
Review URL: https://chromiumcodereview.appspot.com/10037013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
-rw-r--r-- | base/base.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/base/base.gypi b/base/base.gypi index 48812a0..facb472 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -21,8 +21,6 @@ 'third_party/nspr/prtime.h', 'third_party/nspr/prcpucfg_linux.h', 'third_party/xdg_mime/xdgmime.h', - 'android/build_info.cc', - 'android/build_info.h', 'android/scoped_java_ref.cc', 'android/scoped_java_ref.h', 'android/jni_android.cc', |