Some more changes for Android: fixed arm64-v8a compilation.

bochs/build/android/bochs/AndroidAppSettings.cfg

@@ -7,10 +7,10 @@ AppName="Bochs"
 AppFullName=net.sourceforge.bochs
 
 # Application version code (integer)
-AppVersionCode=2689
+AppVersionCode=26810
 
 # Application user-visible version name (string)
-AppVersionName="2.6.8.9"
+AppVersionName="2.6.8.10"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
@@ -128,7 +128,7 @@ ShowMouseCursor=n
 ScreenFollowsMouse=n
 
 # Generate more touch events, by default SDL generates one event per one video frame, this is useful for drawing apps (y) or (n)
-GenerateSubframeTouchEvents=
+GenerateSubframeTouchEvents=n
 
 # Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n)
 ForceRelativeMouseMode=y
@@ -177,7 +177,7 @@ AppRecordsAudio=n
 AccessSdCard=y
 
 # Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n)
-AccessInternet=
+AccessInternet=y
 
 # Immersive mode - Android will hide on-screen Home/Back keys. Looks bad if you invoke Android keyboard. (y) / (n)
 ImmersiveMode=
@@ -238,16 +238,16 @@ FirstStartMenuOptions=''
 AppMinimumRAM=256
 
 # GCC version, 4.6 (default) or 4.8, CLANG is not supported yet
-NDK_TOOLCHAIN_VERSION=
+NDK_TOOLCHAIN_VERSION=4.9
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips
-MultiABI='armeabi-v7a x86'
+MultiABI='armeabi-v7a x86 arm64-v8a'
 
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed
 # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 
-CompiledLibraries="lzma"
+CompiledLibraries=""
 
 # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
 CustomBuildScript=y
@@ -285,4 +285,3 @@ AdmobBannerSize=
 
 # Google Play Game Services application ID, required for cloud saves to work
 GooglePlayGameServicesId=
-

bochs/build/android/bochs/AndroidBuild.sh

@@ -12,11 +12,13 @@ fi
 mkdir -p bin-$1
 
 if [ \! -f bin-$1/Makefile ] ; then
-	env CFLAGS="-Ofast -ffast-math" \
+#        env CLANG=1
+
+  if [ "$1" = arm64-v8a ]; then
+	env CFLAGS="-O2 -ffast-math" \
 	env LIBS="-lgnustl_static" \
 		../setEnvironment-$1.sh sh -c "cd bin-$1 && ../bochs/configure \
-		--build=x86_64-unknown-linux-gnu --host=$2 \
-		--with-sdl \
+		--build=x86_64-unknown-linux-gnu --host=$2 --with-sdl \
 		--enable-cpu-level=6 --enable-smp --enable-x86-64 --enable-avx \
 		--enable-sb16 --enable-es1370 \
 		--enable-ne2000 --enable-e1000 \
@@ -24,6 +26,19 @@ if [ \! -f bin-$1/Makefile ] ; then
 		--enable-all-optimizations \
 		--enable-usb --enable-usb-ohci \
 		--disable-gameport --disable-disasm --disable-docbook" || exit 1
+  else
+	env CFLAGS="-Ofast" \
+	env LIBS="-lgnustl_static" \
+		../setEnvironment-$1.sh sh -c "cd bin-$1 && ../bochs/configure \
+		--build=x86_64-unknown-linux-gnu --host=$2 --with-sdl \
+		--enable-cpu-level=6 --enable-smp --enable-x86-64 --enable-avx \
+		--enable-sb16 --enable-es1370 \
+		--enable-ne2000 --enable-e1000 \
+		--enable-clgd54xx --enable-voodoo \
+		--enable-all-optimizations \
+		--enable-usb --enable-usb-ohci \
+		--disable-gameport --disable-disasm --disable-docbook" || exit 1
+  fi
 fi