Add ANDROID_UNPACK to other bootstraps

Author: KeyWeeUsr

pythonforandroid/bootstraps/pygame/build/src/org/renpy/android/SDLSurfaceView.java

@@ -706,6 +706,7 @@ public void run() {
         nativeResize(mWidth, mHeight);
         nativeInitJavaCallbacks();
         nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
+        nativeSetEnv("ANDROID_UNPACK", mFilesDirectory);
         nativeSetEnv("ANDROID_ARGUMENT", mArgument);
         nativeSetEnv("ANDROID_APP_PATH", mArgument);
         nativeSetEnv("PYTHONOPTIMIZE", "2");

pythonforandroid/bootstraps/service_only/build/src/org/kivy/android/PythonService.java

@@ -26,6 +26,7 @@ public abstract class PythonService extends Service implements Runnable {
     private String pythonName;
     private String pythonHome;
     private String pythonPath;
+    private String ANDROID_UNPACK;
     private String serviceEntrypoint;
     private String pythonServiceArgument;
 
@@ -70,6 +71,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         pythonName = extras.getString("pythonName");
         pythonHome = extras.getString("pythonHome");
         pythonPath = extras.getString("pythonPath");
+        ANDROID_UNPACK = extras.getString("ANDROID_UNPACK");
         pythonServiceArgument = extras.getString("pythonServiceArgument");
 
         Log.v(TAG, "Starting Python thread");
@@ -127,7 +129,7 @@ public void onDestroy() {
     public void run() {
         PythonUtil.loadLibraries(getFilesDir());
         nativeStart(androidPrivate, androidArgument, serviceEntrypoint, pythonName, pythonHome,
-                pythonPath, pythonServiceArgument);
+                pythonPath, pythonServiceArgument, ANDROID_UNPACK);
         stopSelf();
     }
 
@@ -143,5 +145,5 @@ public void run() {
     public static native void nativeStart(String androidPrivate, String androidArgument,
                                           String serviceEntrypoint, String pythonName,
                                           String pythonHome, String pythonPath,
-                                          String pythonServiceArgument);
+                                          String pythonServiceArgument, String ANDROID_UNPACK);
 }

pythonforandroid/bootstraps/service_only/build/templates/Service.tmpl.java

@@ -40,6 +40,7 @@ public static void start(Context ctx, String pythonServiceArgument) {
         intent.putExtra("serviceDescription", "");
         intent.putExtra("pythonName", "{{ name }}");
         intent.putExtra("pythonHome", argument);
+        intent.putExtra("ANDROID_UNPACK", argument);
         intent.putExtra("pythonPath", argument + ":" + argument + "/lib");
         intent.putExtra("pythonServiceArgument", pythonServiceArgument);
         ctx.startService(intent);

pythonforandroid/bootstraps/webview/build/src/org/kivy/android/PythonActivity.java

@@ -158,6 +158,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         PythonActivity.nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
         PythonActivity.nativeSetEnv("ANDROID_ARGUMENT", mFilesDirectory);
         PythonActivity.nativeSetEnv("ANDROID_APP_PATH", mFilesDirectory);
+        PythonActivity.nativeSetEnv("ANDROID_UNPACK", mFilesDirectory);
         PythonActivity.nativeSetEnv("ANDROID_ENTRYPOINT", "main.pyo");
         PythonActivity.nativeSetEnv("PYTHONHOME", mFilesDirectory);
         PythonActivity.nativeSetEnv("PYTHONPATH", mFilesDirectory + ":" + mFilesDirectory + "/lib");