ANDROID: update handling for external modules

Author: chrisws

src/platform/android/app/build.gradle

@@ -11,7 +11,7 @@ android {
     targetSdkVersion 34
     versionCode 59
     versionName '12.26'
-    resConfigs 'en'
+    resourceConfigurations += ['en']
   }
 
   signingConfigs {
@@ -54,6 +54,6 @@ android {
 
 dependencies {
   implementation 'androidx.core:core:1.12.0'
-  //implementation files('libs/ioio-release.aar')
+  //implementation files('libs/ioio-debug.aar')
   testImplementation 'junit:junit:4.13.2'
 }

src/platform/android/app/proguard-rules.pro

@@ -2,7 +2,8 @@
 # For more details, see https://developer.android.com/build/shrink-code
 #
 
--keep public class * { public *; }
+-keep public class net.sourceforge.smallbasic.** { public *; }
+-keep public class ioio.lib.** { *; }
 -keepclasseswithmembernames class * { native <methods>; }
 -printmapping build/outputs/mapping/release/mapping.txt
 -keepattributes LineNumberTable,SourceFile

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -369,12 +369,12 @@ public int getWindowHeight() {
   }
 
   public boolean loadModules() {
-    Log.i(TAG, "loadModules: " + getActivity() );
+    Log.i(TAG, "loadModules: " + getActivity());
     boolean result;
     try {
       System.loadLibrary("ioio");
       Class<?> clazz = Class.forName("net.sourceforge.smallbasic.ioio.IOIOLoader");
-      clazz.getDeclaredConstructor(Long.class).newInstance(getActivity());
+      clazz.getDeclaredConstructor(Long.class, Context.class).newInstance(getActivity(), this);
       Log.d(TAG, "loadModules - success");
       result = true;
     } catch (Exception | UnsatisfiedLinkError e) {

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.3.0'
+    classpath 'com.android.tools.build:gradle:8.3.1'
   }
 }
 

src/platform/android/jni/runtime.cpp

@@ -627,9 +627,14 @@ void Runtime::saveConfig() {
       char *env = environ[i];
       if (strstr(env, SERVER_SOCKET_KEY) != nullptr ||
           strstr(env, SERVER_TOKEN_KEY) != nullptr ||
-          strstr(env, LOAD_MODULES_KEY) != nullptr ||
           strstr(env, FONT_ID_KEY) != nullptr) {
         fprintf(fp, "%s\n", env);
+      } else if (strstr(env, LOAD_MODULES_KEY) != nullptr) {
+        if (strstr(env, LOAD_MODULES_KEY "=2") != nullptr)  {
+          fprintf(fp, "%s=1\n", LOAD_MODULES_KEY);
+        } else {
+          fprintf(fp, "%s\n", env);
+        }
       }
     }
     fclose(fp);