From 842c972d5011ed671d2486deee78ae7640b0cca6 Mon Sep 17 00:00:00 2001 From: michaelbai Date: Wed, 28 Jan 2015 13:40:36 -0800 Subject: 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} --- content/content_app.gypi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'content/content_app.gypi') 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', -- cgit v1.1