add properties for target sdk wear

Author: codeanticode

mode/src/processing/mode/android/AVD.java

@@ -38,9 +38,6 @@ public class AVD {
   final static private int WEAR  = 1;
 
   final static public String DEFAULT_ABI = "x86";
-  
-  public static final String TARGET_SDK_ARM = "24";
-  public static final String TARGET_SDK_WEAR = "30";
 
   public final static String DEFAULT_PHONE_PORT = "5566";
   public final static String DEFAULT_WEAR_PORT  = "5576";  
@@ -102,11 +99,11 @@ static public String getTargetSDK(boolean wear, String abi) {
       // The ARM images using Google APIs are too slow, so use the
       // older Android (AOSP) images.
       // TODO check if we can move to the regular ARM images...
-      return TARGET_SDK_ARM;
+      return AndroidBuild.TARGET_WEAR_SDK_ARM;
     } else if (abi.equals("arm64-v8a")) {
-      return wear ? TARGET_SDK_WEAR : AndroidBuild.TARGET_PLATFORM;
+      return wear ? AndroidBuild.TARGET_WEAR_SDK : AndroidBuild.TARGET_SDK;
     } else { // x86
-      return wear ? TARGET_SDK_WEAR : AndroidBuild.TARGET_PLATFORM;
+      return wear ? AndroidBuild.TARGET_WEAR_SDK : AndroidBuild.TARGET_SDK;
     }
   }
 

mode/src/processing/mode/android/AndroidBuild.java

@@ -67,8 +67,9 @@ class AndroidBuild extends JavaBuild {
   static public String MIN_SDK_WATCHFACE;
 
   // Versions of all required dependencies
-  static public String TARGET_SDK;  
-  static public String TARGET_PLATFORM;
+  static public String TARGET_SDK;
+  static public String TARGET_WEAR_SDK_ARM;
+  static public String TARGET_WEAR_SDK;  
   static public String GRADLE_PLUGIN_VER;
   static public String APPCOMPAT_VER;
   static public String V4LEGACY_VER;
@@ -1024,8 +1025,21 @@ static public void initVersions(File file) {
         TARGET_SDK = defTargetSDK;
         Preferences.set("android.sdk.target", TARGET_SDK);
       }
-      TARGET_PLATFORM = "android-" + TARGET_SDK;
-      
+
+      TARGET_WEAR_SDK_ARM = Preferences.get("android.sdk.target.wear_arm");
+      String defTargetWearSDKArm = props.getProperty("android-platform-wear-arm");
+      if (TARGET_WEAR_SDK_ARM == null || PApplet.parseInt(TARGET_WEAR_SDK_ARM) != PApplet.parseInt(defTargetWearSDKArm)) {
+        TARGET_WEAR_SDK_ARM = defTargetWearSDKArm;
+        Preferences.set("android.sdk.target.wear_arm", TARGET_WEAR_SDK_ARM);
+      }
+
+      TARGET_WEAR_SDK = Preferences.get("android.sdk.target.wear");
+      String defTargetWearSDK = props.getProperty("android-platform-wear");
+      if (TARGET_WEAR_SDK == null || PApplet.parseInt(TARGET_WEAR_SDK) != PApplet.parseInt(defTargetWearSDK)) {
+        TARGET_WEAR_SDK = defTargetWearSDK;
+        Preferences.set("android.sdk.target.wear", TARGET_WEAR_SDK);
+      }
+
       APPCOMPAT_VER = Preferences.get("android.sdk.appcompat");
       String defAppCompatVer = props.getProperty("androidx.appcompat%appcompat");
       if (APPCOMPAT_VER == null || !versionCheck(APPCOMPAT_VER, defAppCompatVer)) {

mode/version.properties

@@ -1,5 +1,7 @@
 # Basics
 android-platform = 33
+android-platform-wear = 30
+android-platform-wear-arm = 24
 android-toolslib = 30.3.0
 android-gradle-plugin = 7.1.0
 gradle-wrapper = 7.4.2