Merge pull request #40 from GRRedWings/API30-Build

Api30 build

Author: GRRedWings

Android/bldlibrary.patch

@@ -0,0 +1,52 @@
+--- Python-3.12.1-original/configure	2023-11-22 09:33:49
++++ Python-3.12.1/configure	2023-11-22 10:13:05
+@@ -7484,6 +7484,7 @@
+
+   case $ac_sys_system in
+     CYGWIN*)
+           LDLIBRARY='libpython$(LDVERSION).dll.a'
++          BLDLIBRARY='-L. -lpython$(LDVERSION)'
+           DLLLIBRARY='libpython$(LDVERSION).dll'
+           ;;
+     SunOS*)
+--- Python-3.12.1-original/configure	2023-11-22 09:33:49
++++ Python-3.12.1/configure	2023-11-22 10:13:05
+@@ -24378,7 +24378,7 @@
+ # On Android and Cygwin the shared libraries must be linked with libpython.
+ 
+ if test "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then
+-  LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
++  LIBPYTHON="$BLDLIBRARY"
+ else
+   LIBPYTHON=''
+ fi
+--- Python-3.12.1-original/Modules/makesetup	2023-10-02 12:48:14
++++ Python-3.12.1/Modules/makesetup	2023-11-22 10:11:40
+@@ -86,18 +86,6 @@
+ # Newline for sed i and a commands
+ NL='\
+ '
+-
+-# Setup to link with extra libraries when making shared extensions.
+-# Currently, only Cygwin needs this baggage.
+-case `uname -s` in
+-CYGWIN*) if test $libdir = .
+-	 then
+-	 	ExtraLibDir=.
+-	 else
+-	 	ExtraLibDir='$(LIBPL)'
+-	 fi
+-	 ExtraLibs="-L$ExtraLibDir -lpython\$(LDVERSION)";;
+-esac
+ 
+ # Main loop
+ for i in ${*-Setup}
+@@ -286,7 +274,7 @@
+ 				;;
+ 			esac
+ 			rule="$file: $objs"
+-			rule="$rule; \$(BLDSHARED) $objs $libs $ExtraLibs -o $file"
++			rule="$rule; \$(BLDSHARED) $objs $libs \$(LIBPYTHON) -o $file"
+ 			echo "$rule" >>$rulesf
+ 		done
+ 	done

Android/build_deps.py

@@ -5,10 +5,11 @@
 import re
 import subprocess
 from typing import List
+import subprocess
 
 from util import ARCHITECTURES, BASE, SYSROOT, env_vars, ndk_unified_toolchain, parse_args
 
-logger = logging.getLogger(__name__)
+import patch
 
 class Package:
     def __init__(self, target_arch_name: str, android_api_level: int):
@@ -18,7 +19,6 @@ def __init__(self, target_arch_name: str, android_api_level: int):
 
     def run(self, cmd: List[str]):
         cwd = BASE / 'deps' / re.sub(r'\.tar\..*', '', os.path.basename(self.source))
-        logger.debug(f'Running in {cwd}: ' + ' '.join([shlex.quote(str(arg)) for arg in cmd]))
         subprocess.check_call(cmd, cwd=cwd)
 
     def build(self):
@@ -34,6 +34,9 @@ def configure(self):
             '--host=' + self.target_arch.ANDROID_TARGET,
             '--disable-shared',
         ] + getattr(self, 'configure_args', []))
+        
+        pset = patch.fromfile('Android/patchTrampc.patch')
+        pset.apply()
 
     def make(self):
         self.run(['make'])
@@ -72,16 +75,16 @@ class LibFFI(Package):
     configure_args = ['--disable-builddir']
 
 class LibUUID(Package):
-    source = 'https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.xz'
+    source = 'https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.2.tar.xz'
     configure_args = ['--disable-all-programs', '--enable-libuuid']
 
 class NCurses(Package):
-    source = 'https://ftp.gnu.org/gnu/ncurses/ncurses-6.3.tar.gz'
+    source = 'https://ftp.gnu.org/gnu/ncurses/ncurses-6.4.tar.gz'
     # Not stripping the binaries as there is no easy way to specify the strip program for Android
     configure_args = ['--without-ada', '--enable-widec', '--without-debug', '--without-cxx-binding', '--disable-stripping']
 
 class OpenSSL(Package):
-    source = 'https://www.openssl.org/source/openssl-3.0.7.tar.gz'
+    source = 'https://www.openssl.org/source/openssl-3.0.12.tar.gz'
 
     def configure(self):
         # OpenSSL handles NDK internal paths by itself
@@ -93,8 +96,6 @@ def configure(self):
             os.environ['PATH'],
         ))
 
-        logger.debug(f'$PATH for OpenSSL: {path}')
-
         os.environ['PATH'] = path
 
         openssl_target = 'android-' + self.target_arch_name
@@ -115,13 +116,24 @@ class Readline(Package):
     configure_args = ['bash_cv_wcwidth_broken=yes']
 
 class SQLite(Package):
-    source = 'https://sqlite.org/2022/sqlite-autoconf-3390400.tar.gz'
+    source = 'https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz'
 
 class XZ(Package):
-    source = 'https://tukaani.org/xz/xz-5.2.7.tar.xz'
+    source = 'https://tukaani.org/xz/xz-5.6.2.tar.xz'
+
+    def make(self):
+        print('******************** About to run make')
+        self.run([
+            'make', 
+            f'CFLAGS={os.environ["CFLAGS"]} {os.environ["CPPFLAGS"]}',
+        ])
+
+        print('******** Finished running make')
+
+
 
 class ZLib(Package):
-    source = 'https://www.zlib.net/zlib-1.2.13.tar.gz'
+    source = 'https://www.zlib.net/zlib-1.3.1.tar.gz'
 
     def configure(self):
         os.environ.update({
@@ -139,7 +151,7 @@ def make(self):
         self.run(['make', 'libz.a'])
 
 def build_package(pkg: Package):
-    subprocess.check_call(['curl', '-fLO', pkg.source], cwd=BASE / 'deps')
+    subprocess.check_call(['curl', '-kfLO', pkg.source], cwd=BASE / 'deps')
     subprocess.check_call(['tar', '--no-same-owner', '-xf', os.path.basename(pkg.source)], cwd=BASE / 'deps')
 
     try:

Android/grph.patch

@@ -0,0 +1,20 @@
+--- /android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/grp.h	2023-10-05 20:43:06.000000000 -0500
++++ /android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/grp.h	2023-10-11 15:13:45.525034100 -0500
+@@ -52,12 +52,12 @@
+ 
+ /* Note: Android has thousands and thousands of ids to iterate through. */
+ 
+-#if __ANDROID_API__ >= 26
+-struct group* _Nullable getgrent(void) __INTRODUCED_IN(26);
++#if __ANDROID_API__ >= 23
++struct group* _Nullable getgrent(void) __INTRODUCED_IN(23);
+ 
+-void setgrent(void) __INTRODUCED_IN(26);
+-void endgrent(void) __INTRODUCED_IN(26);
+-#endif /* __ANDROID_API__ >= 26 */
++void setgrent(void) __INTRODUCED_IN(23);
++void endgrent(void) __INTRODUCED_IN(23);
++#endif /* __ANDROID_API__ >= 23 */
+ 
+ 
+ #if __ANDROID_API__ >= 24

Android/patchTrampc.patch

@@ -0,0 +1,11 @@
+--- a/Android/deps/libffi-3.4.4/src/tramp.c	2022-10-23 10:23:27.000000000 -0500
++++ b/Android/deps/libffi-3.4.4/src/tramp.c	2023-10-10 15:04:02.008920000 -0500
+@@ -249,6 +249,8 @@
+   return 1;
+ }
+ 
++int open_temp_exec_file (void);
++
+ #endif /* defined (__linux__) || defined (__CYGWIN__) */
+ 
+ #if defined (__linux__) || defined (__CYGWIN__)

Android/trampc.patch

@@ -0,0 +1,11 @@
+--- a/Android/deps/libffi-3.4.4/src/tramp.c	2022-10-23 10:23:27.000000000 -0500
++++ b/Android/deps/libffi-3.4.4/src/tramp.c	2023-10-10 15:04:02.008920000 -0500
+@@ -249,6 +249,8 @@
+   return 1;
+ }
+ 
++int open_temp_exec_file (void);
++
+ #endif /* defined (__linux__) || defined (__CYGWIN__) */
+ 
+ #if defined (__linux__) || defined (__CYGWIN__)

Android/util.py

@@ -76,5 +76,5 @@ def env_vars(target_arch_name: str, android_api_level: int) -> Dict[str, str]:
 def parse_args():
     parser = argparse.ArgumentParser()
     parser.add_argument('--arch', required=True, choices=ARCHITECTURES.keys(), dest='target_arch_name')
-    parser.add_argument('--api', required=True, type=int, choices=range(21, 30), dest='android_api_level')
+    parser.add_argument('--api', required=True, type=int, choices=range(30, 40), dest='android_api_level')
     return parser.parse_known_args()

AndroidApp/app/build.gradle

@@ -3,9 +3,9 @@ apply plugin: 'com.android.application'
 android {
     defaultConfig {
         applicationId "com.example.pythontest"
-        compileSdkVersion 33
-        minSdkVersion 23
-        targetSdkVersion 33
+        compileSdkVersion = 34
+        minSdkVersion 30
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -26,36 +26,34 @@ android {
     }
 
     packagingOptions {
-        pickFirst 'lib/arm64-v8a/libpython3.11.so'
-        pickFirst 'lib/armeabi-v7a/libpython3.11.so'
-        pickFirst 'lib/x86_64/libpython3.11.so'
+        pickFirst 'lib/arm64-v8a/libpython3.12.so'
+        pickFirst 'lib/x86_64/libpython3.12.so'
     }
 
     // Only building ARM currently
     // productFlavors allows us to specify exactly which ABIs we support
-    flavorDimensions "arm8", "arm", "x86_64"
+    flavorDimensions.add("arm8")
+    flavorDimensions.add("x86_64")
     productFlavors {
         arm8 {
             dimension "arm8"
             ndk {
+                //noinspection ChromeOsAbiSupport
                 abiFilters 'arm64-v8a'
             }
         }
-        arm {
-            dimension "arm"
-            ndk {
-                abiFilter 'armeabi-v7a'
-            }
-        }
         x86_64 {
             dimension "x86_64"
             ndk {
                 abiFilter 'x86_64'
             }
         }
     }
-
-
+    namespace 'com.example.pythontest'
+    buildFeatures {
+        aidl true
+        buildConfig true
+    }
 }
 
 dependencies {

AndroidApp/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        package="com.example.pythontest">
+        xmlns:tools="http://schemas.android.com/tools">
 
     <application
             android:allowBackup="true"