Disable PYTHONOPTIMIZE=2 for application and service, so that Pycryptodome can use pycparser/cffi instead of broken ctypes.pythonapi

pakal · pakal · commit 7e47f181d2d7 · 2020-02-22T20:21:16.000+01:00
diff --git a/pythonforandroid/bootstraps/common/build/jni/application/src/start.c b/pythonforandroid/bootstraps/common/build/jni/application/src/start.c
@@ -397,7 +397,7 @@ JNIEXPORT void JNICALL Java_org_kivy_android_PythonService_nativeStart(
   setenv("ANDROID_ARGUMENT", android_argument, 1);
   setenv("ANDROID_APP_PATH", android_argument, 1);
   setenv("ANDROID_ENTRYPOINT", service_entrypoint, 1);
-  setenv("PYTHONOPTIMIZE", "2", 1);
+  //setenv("PYTHONOPTIMIZE", "2", 1);
   setenv("PYTHON_NAME", python_name, 1);
   setenv("PYTHONHOME", python_home, 1);
   setenv("PYTHONPATH", python_path, 1);
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java
@@ -185,7 +185,7 @@ protected void onPostExecute(String result) {
             SDLActivity.nativeSetenv("ANDROID_UNPACK", app_root_dir);
             SDLActivity.nativeSetenv("PYTHONHOME", app_root_dir);
             SDLActivity.nativeSetenv("PYTHONPATH", app_root_dir + ":" + app_root_dir + "/lib");
-            SDLActivity.nativeSetenv("PYTHONOPTIMIZE", "2");
+            //SDLActivity.nativeSetenv("PYTHONOPTIMIZE", "2");
 
             try {
                 Log.v(TAG, "Access to our meta-data...");
diff --git a/pythonforandroid/bootstraps/service_only/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/service_only/build/src/main/java/org/kivy/android/PythonActivity.java
@@ -168,7 +168,7 @@ public void onClick(DialogInterface dialog,int id) {
         PythonActivity.nativeSetenv("ANDROID_UNPACK", app_root_dir);
         PythonActivity.nativeSetenv("PYTHONHOME", app_root_dir);
         PythonActivity.nativeSetenv("PYTHONPATH", app_root_dir + ":" + app_root_dir + "/lib");
-        PythonActivity.nativeSetenv("PYTHONOPTIMIZE", "2");
+        //PythonActivity.nativeSetenv("PYTHONOPTIMIZE", "2");
 
         try {
             Log.v(TAG, "Access to our meta-data...");
diff --git a/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/PythonActivity.java
@@ -196,7 +196,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         PythonActivity.nativeSetenv("ANDROID_UNPACK", app_root_dir);
         PythonActivity.nativeSetenv("PYTHONHOME", app_root_dir);
         PythonActivity.nativeSetenv("PYTHONPATH", app_root_dir + ":" + app_root_dir + "/lib");
-        PythonActivity.nativeSetenv("PYTHONOPTIMIZE", "2");
+        //PythonActivity.nativeSetenv("PYTHONOPTIMIZE", "2");
 
         try {
             Log.v(TAG, "Access to our meta-data...");
