Moved setenv jni call to PythonActivity

inclement · inclement · commit 76ed15e265ba · 2016-04-27T22:12:57.000+01:00
diff --git a/pythonforandroid/bootstraps/webview/build/jni/src/start.c b/pythonforandroid/bootstraps/webview/build/jni/src/start.c
@@ -316,4 +316,21 @@ JNIEXPORT void JNICALL Java_org_kivy_android_PythonService_nativeStart(
   main(1, argv);
 }
 
+void Java_org_kivy_android_PythonActivity_nativeSetEnv(
+                                    JNIEnv* env, jclass jcls,
+                                    jstring j_name, jstring j_value)
+/* JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_nativeSetEnv( */
+/*                                     JNIEnv* env, jclass jcls, */
+/*                                     jstring j_name, jstring j_value) */
+{
+    jboolean iscopy;
+    const char *name = (*env)->GetStringUTFChars(env, j_name, &iscopy);
+    const char *value = (*env)->GetStringUTFChars(env, j_value, &iscopy);
+    setenv(name, value, 1);
+    (*env)->ReleaseStringUTFChars(env, j_name, name);
+    (*env)->ReleaseStringUTFChars(env, j_value, value);
+}
+
+
+
 #endif
diff --git a/pythonforandroid/bootstraps/webview/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/webview/build/src/org/kivy/android/PythonActivity.java
@@ -67,12 +67,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
         String mFilesDirectory = mActivity.getFilesDir().getAbsolutePath();
         Log.v(TAG, "Setting env vars for start.c and Python to use");
-        SDLActivity.nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
-        SDLActivity.nativeSetEnv("ANDROID_ARGUMENT", mFilesDirectory);
-        SDLActivity.nativeSetEnv("ANDROID_APP_PATH", mFilesDirectory);
-        SDLActivity.nativeSetEnv("ANDROID_ENTRYPOINT", "main.pyo");
-        SDLActivity.nativeSetEnv("PYTHONHOME", mFilesDirectory);
-        SDLActivity.nativeSetEnv("PYTHONPATH", mFilesDirectory + ":" + mFilesDirectory + "/lib");
+        PythonActivity.nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
+        PythonActivity.nativeSetEnv("ANDROID_ARGUMENT", mFilesDirectory);
+        PythonActivity.nativeSetEnv("ANDROID_APP_PATH", mFilesDirectory);
+        PythonActivity.nativeSetEnv("ANDROID_ENTRYPOINT", "main.pyo");
+        PythonActivity.nativeSetEnv("PYTHONHOME", mFilesDirectory);
+        PythonActivity.nativeSetEnv("PYTHONPATH", mFilesDirectory + ":" + mFilesDirectory + "/lib");
 
         try {
             Log.v(TAG, "Access to our meta-data...");
@@ -353,5 +353,6 @@ protected void showLoadingScreen() {
       }
     }
 
+    public static native void nativeSetEnv(String j_name, String j_value);
 
 }
