diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 04:12:13 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 04:12:13 +0000 |
| commit | f804551d543ddbe59a1d216a30b217a90ca5a910 (patch) | |
| tree | cc6df91b8cfb6be51cf73ff5c47a3760317aeb82 /content/content.gyp | |
| parent | 2362015c5ba54deae8e362ed55aa3aa2ecb3a449 (diff) | |
| download | chromium_src-f804551d543ddbe59a1d216a30b217a90ca5a910.zip chromium_src-f804551d543ddbe59a1d216a30b217a90ca5a910.tar.gz chromium_src-f804551d543ddbe59a1d216a30b217a90ca5a910.tar.bz2 | |
Handle LibraryLoader error from the renderer process.
If we fail to load the library in the renderer process, just abort early.
This prevents an extra user-visible dialog that Chrome has crashed. Note
that we currently assume the browser process hits the same error and will
prompt the user. If this only happens for the renderer process we'd end up
with a hung tab, but it's not clear how that would happen.
As part of this, convert the RESULT_CODES enum to be generated from a template so that we can re-use the same values for C++ and Java
BUG=180054
Review URL: https://chromiumcodereview.appspot.com/12464004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/content/content.gyp b/content/content.gyp index 0b40689..f5679b9 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -312,6 +312,7 @@ 'common_aidl', 'content_common', 'page_transition_types_java', + 'result_codes_java', ], 'variables': { 'java_in_dir': '../content/public/android/java', @@ -343,6 +344,18 @@ 'includes': [ '../build/android/java_cpp_template.gypi' ], }, { + 'target_name': 'result_codes_java', + 'type': 'none', + 'sources': [ + 'public/android/java/src/org/chromium/content/common/ResultCodes.template', + ], + 'variables': { + 'package_name': 'org/chromium/content/common', + 'template_deps': ['public/common/result_codes_list.h'], + }, + 'includes': [ '../build/android/java_cpp_template.gypi' ], + }, + { 'target_name': 'surface_texture_jni_headers', 'type': 'none', 'variables': { |