diff options
| author | carlosvaldivia@google.com <carlosvaldivia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 18:34:44 +0000 |
|---|---|---|
| committer | carlosvaldivia@google.com <carlosvaldivia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 18:34:44 +0000 |
| commit | 01e77f96bbd03a13876ae6fb2cf684198d858094 (patch) | |
| tree | 216b6a1f92975d90917ec51eef855733300001c4 /base/base.gypi | |
| parent | ea1be09912afaa22f7a31a0c08a3e99d8ad70147 (diff) | |
| download | chromium_src-01e77f96bbd03a13876ae6fb2cf684198d858094.zip chromium_src-01e77f96bbd03a13876ae6fb2cf684198d858094.tar.gz chromium_src-01e77f96bbd03a13876ae6fb2cf684198d858094.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131593 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/base/base.gypi b/base/base.gypi index facb472..48812a0 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -21,6 +21,8 @@ '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', |