bootstrap: copy all the .so into lib with libpy_ prefix. Detect this prefix and load it with a custom importer.

tito · tito · commit 0c25898de6fd · 2014-06-22T20:47:12.000+02:00
diff --git a/bootstrap/common/build.py b/bootstrap/common/build.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python2.7
 
-from os.path import dirname, join, isfile, realpath, relpath, split, exists
+from os.path import dirname, join, isfile, realpath, relpath, split, exists, \
+    basename
 from zipfile import ZipFile
 import sys
 sys.path.insert(0, 'buildlib/jinja2.egg')
@@ -224,7 +225,17 @@ def copy_to_assets(source_dirs, ignore_path=[]):
     print 'copy_to_assets()', source_dirs, ignore_path
     for fn, afn in iterate_sources(source_dirs, ignore_path):
         print '{}: {}'.format(fn, afn)
-        dest_fn = join('assets', afn)
+
+        if afn.endswith(".so"):
+            # copy to libs instead
+            afn_dirname = dirname(afn)
+            if "python2.7" in afn_dirname:
+                # python lib, strip the directory
+                afn_dirname = ""
+            dest_fn = join("libs", "armeabi", "libpy_{}".format(
+                afn_dirname.replace("/", "_").replace(".", "") + basename(afn)))
+        else:
+            dest_fn = join('assets', afn)
         dest_dir = dirname(dest_fn)
         if not exists(dest_dir):
             os.makedirs(dest_dir)
diff --git a/bootstrap/minimal/assets/_bootstrap.py b/bootstrap/minimal/assets/_bootstrap.py
@@ -83,6 +83,39 @@ def flush(self):
 sysconfig.get_config_h_filename = lambda: pyconfig_fn
 
 
+#
+# Step 4: install a custom importer
+#
+
+import imp
+from os.path import join, exists
+
+ANDROID_LIB_PATH = posix.environ["ANDROID_LIB_PATH"]
+
+
+class CustomBuiltinImporter(object):
+    def find_module(self, fullname, mpath=None):
+        modname = "libpy_{}.so".format(fullname.replace(".", "_"))
+        modfn = join(ANDROID_LIB_PATH, modname)
+        if exists(modfn):
+            return self
+
+    def load_module(self, fullname):
+        fn = fullname.replace(".", "_")
+        mod = sys.modules.get(fn)
+        if mod is None:
+            try:
+                mod = imp.load_dynamic(
+                    fn,
+                    join(ANDROID_LIB_PATH, "libpy_{}.so".format(fn)))
+            except ImportError:
+                # untested part, similar to iOS custom importer.
+                mod = imp.load_dynamic(fullname, fullname)
+        return mod
+
+sys.meta_path.append(CustomBuiltinImporter())
+
+
 #
 # Step 4: bootstrap the application !
 #
diff --git a/bootstrap/minimal/jni/main.c b/bootstrap/minimal/jni/main.c
@@ -117,10 +117,20 @@ void android_main(struct android_app* state) {
     jboolean isCopy;
     str = (*env)->GetStringUTFChars(env, (jstring)result, &isCopy);
     LOGI("Looked up package code path: %s", str);
+    setenv("ANDROID_APK_FN", str, 1);
+
+    methodID = (*env)->GetMethodID(env, clazz, "getApplicationInfo", "()Landroid/content/pm/ApplicationInfo;");
+    jobject appInfo = (*env)->CallObjectMethod(env, activity->clazz, methodID);
+    jfieldID fieldID = (*env)->GetFieldID(env,
+        (*env)->GetObjectClass(env, appInfo), "nativeLibraryDir", "Ljava/lang/String;");
+    result = (*env)->GetObjectField(env, appInfo, fieldID);
+    str = (*env)->GetStringUTFChars(env, (jstring)result, &isCopy);
+    LOGI("Looked up library code path: %s", str);
+    setenv("ANDROID_LIB_PATH", str, 1);
+
     (*activity->vm)->DetachCurrentThread(activity->vm);
 
     // set some envs
-    setenv("ANDROID_APK_FN", str, 1);
     setenv("ANDROID_INTERNAL_DATA_PATH", state->activity->internalDataPath, 1);
     setenv("ANDROID_EXTERNAL_DATA_PATH", state->activity->externalDataPath, 1);
     LOGI("Internal data path is: %s", state->activity->internalDataPath);
