chromecast/chromecast.gyp - Issue 620673003: Chromecast: adds crash handling for Android build.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromecast/chromecast.gyp

Issue 620673003: Chromecast: adds crash handling for Android build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: style nits Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chromecast/android/chromecast_config_android_stub.cc ('k') | chromecast/common/global_descriptors.h » ('j') | chromecast/crash/android/cast_crash_reporter_client_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/chromecast.gyp

diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp

index 687d3e89f5ad1da34e2803193645f834208d4a13..9e3663b16ee6922321a728ab91646f5a60b1b729 100644

--- a/chromecast/chromecast.gyp

+++ b/chromecast/chromecast.gyp

@@ -317,23 +317,33 @@

'cast_shell_pak',

'cast_version_header',

'../base/base.gyp:base',

+ '../breakpad/breakpad.gyp:breakpad_client',

+ '../components/components.gyp:breakpad_host',

+ '../components/components.gyp:crash_component',

'../content/content.gyp:content_app_browser',

'../content/content.gyp:content',

'../skia/skia.gyp:skia',

'../ui/gfx/gfx.gyp:gfx',

'../ui/gl/gl.gyp:gl',

+ 'include_dirs': [

+ '../breakpad/src',

+ ],

'sources': [

'android/cast_jni_registrar.cc',

'android/cast_jni_registrar.h',

'android/chromecast_config_android.cc',

'android/chromecast_config_android.h',

'android/platform_jni_loader.h',

+ 'crash/android/cast_crash_reporter_client_android.cc',

+ 'crash/android/cast_crash_reporter_client_android.h',

+ 'crash/android/crash_handler.cc',

+ 'crash/android/crash_handler.h',

'shell/app/android/cast_jni_loader.cc',

- 'shell/browser/android/cast_window_manager.cc',

- 'shell/browser/android/cast_window_manager.h',

'shell/browser/android/cast_window_android.cc',

'shell/browser/android/cast_window_android.h',

+ 'shell/browser/android/cast_window_manager.cc',

+ 'shell/browser/android/cast_window_manager.h',

'conditions': [

['chromecast_branding=="Chrome"', {

@@ -342,6 +352,7 @@

}, {

'sources': [

+ 'android/chromecast_config_android_stub.cc',

'android/platform_jni_loader_stub.cc',

}]

@@ -395,6 +406,7 @@

'target_name': 'cast_jni_headers',

'type': 'none',

'sources': [

+ 'shell/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java',

'shell/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java',

'shell/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java',