Save local p4a custom changes

Author: lanmao

pythonforandroid/bootstraps/qt/build/jni/application/src/Android.mk

@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := main_$(PREFERRED_ABI)
 
 # Add your application source files here...
-LOCAL_SRC_FILES := start.c
+LOCAL_SRC_FILES := start.c pyjniusjni.c
 
 LOCAL_CFLAGS += -I$(PYTHON_INCLUDE_ROOT) $(EXTRA_CFLAGS)
 

pythonforandroid/bootstraps/qt/build/jni/application/src/pyjniusjni.c

@@ -0,0 +1,65 @@
+#include <pthread.h>
+#include <jni.h>
+#include "android/log.h"
+
+#define LOG_TAG "Python_android"
+#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+
+JNIEnv* Android_JNI_GetEnv(void);
+static void Android_JNI_ThreadDestroyed(void*);
+
+static pthread_key_t mThreadKey;
+static JavaVM* mJavaVM;
+
+int Android_JNI_SetupThread(void)
+{
+    Android_JNI_GetEnv();
+    return 1;
+}
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+    JNIEnv *env;
+    mJavaVM = vm;
+    LOGI("JNI_OnLoad called");
+    if ((*mJavaVM)->GetEnv(mJavaVM, (void**) &env, JNI_VERSION_1_4) != JNI_OK) {
+        LOGE("Failed to get the environment using GetEnv()");
+        return -1;
+    }
+
+    if (pthread_key_create(&mThreadKey, Android_JNI_ThreadDestroyed) != 0) {
+        __android_log_print(ANDROID_LOG_ERROR, "pyjniusjni", "Error initializing pthread key");
+    }
+    Android_JNI_SetupThread();
+
+    return JNI_VERSION_1_4;
+}
+
+JNIEnv* Android_JNI_GetEnv(void)
+{
+    JNIEnv *env;
+    int status = (*mJavaVM)->AttachCurrentThread(mJavaVM, &env, NULL);
+    if(status < 0) {
+        LOGE("failed to attach current thread");
+        return 0;
+    }
+
+    pthread_setspecific(mThreadKey, (void*) env);
+
+    return env;
+}
+
+static void Android_JNI_ThreadDestroyed(void* value)
+{
+    JNIEnv *env = (JNIEnv*) value;
+    if (env != NULL) {
+        (*mJavaVM)->DetachCurrentThread(mJavaVM);
+        pthread_setspecific(mThreadKey, NULL);
+    }
+}
+
+void *WebView_AndroidGetJNIEnv()
+{
+    return Android_JNI_GetEnv();
+}

pythonforandroid/bootstraps/qt/build/src/main/java/org/kivy/android/PythonActivity.java

@@ -122,8 +122,10 @@ public void onDestroy() {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        // If it wasn't the Back key or there's no web page history, bubble up to the default
-        // system behavior (probably exit the activity)
+        if (keyCode != KeyEvent.KEYCODE_BACK) {
+            return super.onKeyDown(keyCode, event);
+        }
+
         if (SystemClock.elapsedRealtime() - lastBackClick > 2000) {
             lastBackClick = SystemClock.elapsedRealtime();
             Toast.makeText(this, "Click again to close the app", Toast.LENGTH_LONG).show();

pythonforandroid/distribution.py

@@ -92,6 +92,7 @@ def get_distribution(
         '''
 
         possible_dists = Distribution.get_distributions(ctx)
+        requested_recipes = {recipe.lower() for recipe in recipes}
         debug(f"All possible dists: {possible_dists}")
 
         # Will hold dists that would be built in the same folder as an existing dist
@@ -115,6 +116,7 @@ def get_distribution(
         # 1) Check if any existing dists meet the requirements
         _possible_dists = []
         for dist in possible_dists:
+            dist_recipes = {recipe.lower() for recipe in dist.recipes}
             if (
                 ndk_api is not None and dist.ndk_api != ndk_api
             ) or dist.ndk_api is None:
@@ -123,7 +125,7 @@ def get_distribution(
                 )
                 continue
             for recipe in recipes:
-                if recipe not in dist.recipes:
+                if recipe.lower() not in dist_recipes:
                     debug(f"dist {dist} missing recipe {recipe}")
                     break
             else:
@@ -149,8 +151,9 @@ def get_distribution(
             if not all(arch_name in dist.archs for arch_name in archs):
                 debug("Skipping dist due to arch mismatch")
                 continue
-            if (set(dist.recipes) == set(recipes) or
-                (set(recipes).issubset(set(dist.recipes)) and
+            dist_recipes = {recipe.lower() for recipe in dist.recipes}
+            if (dist_recipes == requested_recipes or
+                (requested_recipes.issubset(dist_recipes) and
                  not require_perfect_match)):
                 info_notify('{} has compatible recipes, using this one'
                             .format(dist.name))

pythonforandroid/meson_python.py

@@ -18,14 +18,13 @@ def handle_python_info():
 
     prefix = C.TARGET_PYTHON_PREFIX
 
-    sysconfig_file = glob(join(prefix, "lib/python3.14/_sysconfigdata*.py"))[0]
+    ver_python = f"python{C.PYTHON_MAJOR_VERSION}.{C.PYTHON_MINOR_VERSION}"
+    sysconfig_file = glob(join(prefix, f"lib/{ver_python}/_sysconfigdata*.py"))[0]
 
     spec = importlib.util.spec_from_file_location("_android_cfg", sysconfig_file)
     cfg = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(cfg)
 
-    ver_python = f"python{C.PYTHON_MAJOR_VERSION}.{C.PYTHON_MINOR_VERSION}"
-
     site_path = join(prefix, f"lib/{ver_python}/site-packages")
 
     android_paths = {