diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 21:06:37 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 21:06:37 +0000 |
| commit | 4f2b94f1ce652c4f0bc919627958b8a9cf233128 (patch) | |
| tree | 5ab63a7a3f017bc0ccb8f8aa1769c0f580f9ab30 /content/app | |
| parent | 70637c944c29cc0f7f46c75e5db190da8aa9716b (diff) | |
| download | chromium_src-4f2b94f1ce652c4f0bc919627958b8a9cf233128.zip chromium_src-4f2b94f1ce652c4f0bc919627958b8a9cf233128.tar.gz chromium_src-4f2b94f1ce652c4f0bc919627958b8a9cf233128.tar.bz2 | |
[Android] Make content_shell_apk and chromium_testshell components friendly.
This includes the remaining changes to atleast _compile_ the above
targets. More work is needed for starting up the apps and running.
Inclues:
- Misc EXPORT additions (I assume I can TBR these)
- Introduce a ShellDialogs JNI registrar since it's now a separate
component and ui can't depend on it.
- Random gyp tweaks that are needed to fully specify dependencies
- Change from using NPN_MemAlloc to just plain malloc for the java
bridge. For some reason the NPN_MemAlloc symbol cannot be found in the
component build, but regardless all our implementations end up calling
straight throught to malloc.
BUG=158821
TBR=wjia@chromium.org,willchan@chromium.org,jcivelli@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12281017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 1a2fbd0..4794da1 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -23,10 +23,11 @@ #include "content/common/android/command_line.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" +#include "jni/LibraryLoader_jni.h" #include "media/base/android/media_jni_registrar.h" #include "net/android/net_jni_registrar.h" #include "ui/android/ui_jni_registrar.h" -#include "jni/LibraryLoader_jni.h" +#include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" namespace { base::AtExitManager* g_at_exit_manager = NULL; @@ -77,6 +78,9 @@ static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, if (!ui::android::RegisterJni(env)) return RESULT_CODE_FAILED_TO_REGISTER_JNI; + if (!ui::shell_dialogs::RegisterJni(env)) + return RESULT_CODE_FAILED_TO_REGISTER_JNI; + if (!content::android::RegisterCommonJni(env)) return RESULT_CODE_FAILED_TO_REGISTER_JNI; |