Android platform updates

AndroidAppSettings.cfg

@@ -3,7 +3,7 @@
 AppSettingVersion=19
 
 # libSDL version to use (1.2 or 1.3, specify 1.3 for SDL2)
-LibSdlVersion=1.2
+LibSdlVersion=1.3
 
 # Specify application name (e.x. My Application)
 AppName="Amiberry"
@@ -218,7 +218,7 @@ AppSubdirsBuild=''
 AppBuildExclude=''
 
 # Application command line parameters, including app name as 0-th param
-AppCmdline='uae4arm -f'
+AppCmdline='amiberry -f'
 
 # Here you may type readme text, which will be shown during startup. Format is:
 # Text in English, use \\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?)

AndroidBuild.sh

@@ -9,5 +9,5 @@ JOBS=4
 ln -sf libsdl_ttf.so $LOCAL_PATH/../../../obj/local/$1/libSDL_ttf.so
 ln -sf libguichan.so $LOCAL_PATH/../../../obj/local/$1/libguichan_sdl.so
 
-../setEnvironment-$1.sh sh -c "make -j$JOBS" && mv -f amiberry-android libapplication-$1.so
+../setEnvironment-$1.sh sh -c "make -j$JOBS" && mv -f amiberry libapplication-$1.so
 

Makefile

@@ -47,7 +47,7 @@ else ifeq ($(PLATFORM),android)
     ANDROID = 1
     HAVE_NEON = 1
     HAVE_SDL_DISPLAY = 1
-    NAME  = amiberry-android
+    NAME  = amiberry
 
 #
 # SDL2 with DispmanX targets (RPI only)
@@ -133,7 +133,7 @@ USE_SDL2 = 1
     ANDROID = 1
     HAVE_NEON = 1
     HAVE_SDL_DISPLAY = 1
-    NAME  = amiberry-android
+    NAME  = amiberry
 endif
 
 RM     = rm -f