diff options
author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-29 16:10:15 +0000 |
---|---|---|
committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-29 16:10:15 +0000 |
commit | a2f15b0b1338329e665e434be05b0ba78fdc7669 (patch) | |
tree | f77faa8cf3bcedce82df4626722cadc8bd38c50a /mojo | |
parent | 00465da7a563335c9cf1b6e97e9e87ffb5e64b52 (diff) | |
download | chromium_src-a2f15b0b1338329e665e434be05b0ba78fdc7669.zip chromium_src-a2f15b0b1338329e665e434be05b0ba78fdc7669.tar.gz chromium_src-a2f15b0b1338329e665e434be05b0ba78fdc7669.tar.bz2 |
mojo_shell needs to load more libraries
The Mojo sample_app currently only works in the component build because it
needs to talk to an initialized instance of Mojo IPC and we only initialize the
singleton in the shell.
In order to work in the component build, we need to load each DLL into the
Android process. In content_shell, we have a fancier system that populates this
list from the build process, but we don't have that fancy technology yet in
Mojo. For now, this CL just hard-codes the list of DLLs we need.
R=ben@chromium.org
Review URL: https://codereview.chromium.org/47513012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
-rw-r--r-- | mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java b/mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java index 93d4c0b..ab39ada 100644 --- a/mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java +++ b/mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java @@ -14,7 +14,19 @@ public class LibraryLoader { if (sInitialized) return; sInitialized = true; - System.loadLibrary("mojo_shell"); + // TODO(abarth): We should generate this list of libraries + // automatically like content_shell does. + System.loadLibrary("stlport_shared"); + System.loadLibrary("icuuc.cr"); + System.loadLibrary("icui18n.cr"); + System.loadLibrary("base.cr"); + System.loadLibrary("base_i18n.cr"); + System.loadLibrary("openssl.cr"); + System.loadLibrary("crcrypto.cr"); + System.loadLibrary("url_lib.cr"); + System.loadLibrary("net.cr"); + System.loadLibrary("mojo_system.cr"); + System.loadLibrary("mojo_shell.cr"); Log.i(TAG, "libmojo_shell initialization success."); } } |