diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 21:53:43 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 21:53:43 +0000 |
| commit | 82174aa4938e03fbb38098d2cf283cbf09bfb300 (patch) | |
| tree | 81702cf79b137684475ee3a25565aaacad3a59ca /ppapi | |
| parent | ca8f905b9e13d9698d5f6c38b805e1c390578c9d (diff) | |
| download | chromium_src-82174aa4938e03fbb38098d2cf283cbf09bfb300.zip chromium_src-82174aa4938e03fbb38098d2cf283cbf09bfb300.tar.gz chromium_src-82174aa4938e03fbb38098d2cf283cbf09bfb300.tar.bz2 | |
Enable breakpad building by default on Android.
After https://chromiumcodereview.appspot.com/10407058 we can compile
breakpad by default and still have it disabled for non-official builds.
Changes the Android build to allow compiling breakpad but not use
it by not creating the crash fd and not passing it to the renderer
process unless breakpad is enabled.
Changes linux and Android to use a switch for enabling breakpad
since that's a lot easier to test with on android then an environment
variable.
BUG=105778,170530
Review URL: https://chromiumcodereview.appspot.com/11969025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
3 files changed, 6 insertions, 2 deletions
diff --git a/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py b/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py index cc3d14b..0963887 100755 --- a/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py +++ b/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py @@ -141,8 +141,7 @@ def Main(cleanup_funcs): # dumps to a temporary directory. home_dir = temp_dir os.environ['HOME'] = home_dir - # On Linux, we also need to set CHROME_ENABLE_BREAKPAD. - os.environ['CHROME_ENABLE_BREAKPAD'] = '1' + options.enable_crash_reporter = True result = browser_tester.Run(options.url, options) diff --git a/ppapi/native_client/tools/browser_tester/browser_tester.py b/ppapi/native_client/tools/browser_tester/browser_tester.py index 3b740a3..061a138 100755 --- a/ppapi/native_client/tools/browser_tester/browser_tester.py +++ b/ppapi/native_client/tools/browser_tester/browser_tester.py @@ -136,6 +136,9 @@ def BuildArgParser(): action='store_true', help='Do not signal a failure if the browser process ' 'crashes') + parser.add_option('--enable_crash_reporter', dest='enable_crash_reporter', + action='store_true', default=False, + help='Force crash reporting on.') return parser diff --git a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py index d8bf9ac..1b25f203 100755 --- a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py +++ b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py @@ -305,6 +305,8 @@ class ChromeLauncher(BrowserLauncher): cmd.append('--load-extension=%s' % ','.join(self.options.browser_extensions)) cmd.append('--enable-experimental-extension-apis') + if self.options.enable_crash_reporter: + cmd.append('--enable-crash-reporter-for-testing') if self.options.tool == 'memcheck': cmd = ['src/third_party/valgrind/memcheck.sh', '-v', |