re-enable joystick for android builds; fix config bug when scalequality and aspectratio both exist

android/app/src/main/cpp/pal_config.h

@@ -51,6 +51,8 @@
 
 #define PAL_FILESYSTEM_IGNORE_CASE 1
 
+#define PAL_HAS_JOYSTICKS 1
+
 # define PAL_IS_VALID_JOYSTICK(s)  (strcmp((s), "Android Accelerometer") != 0)
 
 PAL_C_LINKAGE_BEGIN

palcfg.c

@@ -423,13 +423,15 @@ PAL_LoadConfig(
                     break;
                 case PALCFG_ASPECTRATIO:
                 {
-                    char *aspectRatio = ParseStringValue(value.sValue, gConfig.pszScaleQuality);
+                    char *origAspectRatio = strdup(value.sValue);
+                    char *aspectRatio = ParseStringValue(value.sValue, origAspectRatio);
                     char *lasts;
 					if( strchr(aspectRatio,':') == NULL ) {
-						aspectRatio = ParseStringValue(item->DefaultValue.sValue, gConfig.pszScaleQuality);
+						aspectRatio = ParseStringValue(item->DefaultValue.sValue, origAspectRatio);
 					}
 					dwAspectX = atoi(strtok_r(aspectRatio,":",&lasts));
 					dwAspectY = atoi(strtok_r(NULL,       ":",&lasts));
+                    free(origAspectRatio);
                     break;
                 }
 				default: