Fix Android ARM64 Support

- See openal-soft commit 2e8f6a1704dfa0048dbfc2f826847a4aaea3cbe8
- export HOST_ARCH

4 files changed, 8 insertions, 5 deletions

diff --git a/make/build.xml b/make/build.xml
index a6a240c..e44f88b 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -491,6 +491,8 @@
             <arg value="../../openal-soft"/>
             <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.android.cmake"/>
             <arg value="-DANDROID_API_LEVEL=${android.version}"/>
+            <arg value="-DANDROID_TOOLCHAIN_SYSTEM=${env.HOST_ARCH}"/>
+            <arg value="-DARM32_LINKER_OPTS:STRING=-Wl,--fix-cortex-a8"/>
         </exec>
         <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" />
     </target>
@@ -505,8 +507,9 @@
             <arg value="../../openal-soft"/>
             <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.android.cmake"/>
             <arg value="-DANDROID_API_LEVEL=${android.version}"/>
-            <arg value="-DNDK_CPU_ARM64=1"/>
             <arg value="-DANDROID_TOOLCHAIN_SYSTEM=${env.HOST_ARCH}"/>
+            <arg value="-DNDK_CPU_ARM64:BOOL=ON"/>
+            <arg value="-DARM64_LINKER_OPTS:STRING="/>
         </exec>
         <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" />
     </target>
diff --git a/make/scripts/make.joal.all.android-aarch64-cross.sh b/make/scripts/make.joal.all.android-aarch64-cross.sh
index 76a3200..6aa2657 100755
--- a/make/scripts/make.joal.all.android-aarch64-cross.sh
+++ b/make/scripts/make.joal.all.android-aarch64-cross.sh
@@ -33,7 +33,7 @@ export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
 
 #export GCC_VERSION=4.4.3
 export GCC_VERSION=4.9
-HOST_ARCH=linux-x86_64
+export HOST_ARCH=linux-x86_64
 export TARGET_TRIPLE=aarch64-linux-android
 
 export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
@@ -54,5 +54,5 @@ export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 # BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-aarch64 \
-    $* 2>&1 | tee -a make.joal-aarch64-cross.log
+    $* 2>&1 | tee make.joal-aarch64-cross.log
 
diff --git a/make/scripts/make.joal.all.android-armv6-cross.sh b/make/scripts/make.joal.all.android-armv6-cross.sh
index 77da63c..7921bb6 100755
--- a/make/scripts/make.joal.all.android-armv6-cross.sh
+++ b/make/scripts/make.joal.all.android-armv6-cross.sh
@@ -33,7 +33,7 @@ export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
 
 #export GCC_VERSION=4.4.3
 export GCC_VERSION=4.8
-HOST_ARCH=linux-x86_64
+export HOST_ARCH=linux-x86_64
 export TARGET_TRIPLE=arm-linux-androideabi
 
 export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
@@ -54,5 +54,5 @@ export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 # BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-armv6 \
-    $* 2>&1 | tee -a make.joal-armv6-cross.log
+    $* 2>&1 | tee make.joal-armv6-cross.log
 
diff --git a/openal-soft b/openal-soft
-Subproject 178194b7de4b4ad1de0c701356fca46565dde76
+Subproject 2e8f6a1704dfa0048dbfc2f826847a4aaea3cbe