diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-01-28 13:40:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-28 21:41:51 +0000 |
| commit | 842c972d5011ed671d2486deee78ae7640b0cca6 (patch) | |
| tree | b868874a770f6c69579c5bd520b2f7cf225c8d73 /content/content_app.gypi | |
| parent | 005229b167c1a9e415fc814520bf1d650adebb22 (diff) | |
| download | chromium_src-842c972d5011ed671d2486deee78ae7640b0cca6.zip chromium_src-842c972d5011ed671d2486deee78ae7640b0cca6.tar.gz chromium_src-842c972d5011ed671d2486deee78ae7640b0cca6.tar.bz2 | |
This is the first patch to separate JNI registration with initialization, currently, we have JNI_OnLoad defined multiple places which has a lot of
duplicated code and JNI registration and initialization are mixed;
This patch
- Added JNIOnLoadDelegate class for each component specific initialization.
- Added base::android::OnJNIOnLoad() to call a list of delegates
- Migrate testing, content_shell, chrome_shell.
BUG=447393
TBR=thakis
Review URL: https://codereview.chromium.org/864563002
Cr-Commit-Position: refs/heads/master@{#313592}
Diffstat (limited to 'content/content_app.gypi')
| -rw-r--r-- | content/content_app.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content_app.gypi b/content/content_app.gypi index 1956312..57ad42ffc 100644 --- a/content/content_app.gypi +++ b/content/content_app.gypi @@ -22,6 +22,7 @@ 'app/android/app_jni_registrar.h', 'app/android/child_process_service.cc', 'app/android/child_process_service.h', + 'app/android/content_jni_onload.cc', 'app/android/content_main.cc', 'app/android/content_main.h', 'app/android/library_loader_hooks.cc', @@ -30,6 +31,7 @@ 'app/mojo/mojo_init.cc', 'app/mojo/mojo_init.h', 'public/app/android_library_loader_hooks.h', + 'public/app/content_jni_onload.h', 'public/app/content_main.h', 'public/app/content_main_delegate.cc', 'public/app/content_main_delegate.h', |