10 - Android FMOD 2.02 is out of date (#11)

Android has been updated to 2.03.09

Author: Kaiqgs

bridge/Makefile.android

@@ -14,11 +14,13 @@ JAVA_FILES = \
 	src/me/petcu/fmodbridge/BridgeHelper.java
 
 ANDROID_NDK ?= /opt/android-ndk-r25b
-HOST_TAG ?= `uname | tr A-Z a-z`-x86_64
+HOST_TAG ?= linux-x86_64
 
-CC_ARM := $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST_TAG)/bin/clang -target armv7a-linux-androideabi14 --sysroot=$(ANDROID_NDK)/sysroot -I$(ANDROID_NDK)/sysroot/usr/include/arm-linux-androideabi
-CC_ARM64 := $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST_TAG)/bin/clang -target aarch64-linux-androideabi21 --sysroot=$(ANDROID_NDK)/sysroot -I$(ANDROID_NDK)/sysroot/usr/include/aarch64-linux-android
-AR := $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST_TAG)/bin/llvm-ar
+# prebuilt compiler from the NDK toolchain
+TOOLCHAIN_PREFIX := $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST_TAG)
+CC_ARM := $(TOOLCHAIN_PREFIX)/bin/armv7a-linux-androideabi19-clang
+CC_ARM64 := $(TOOLCHAIN_PREFIX)/bin/aarch64-linux-android21-clang
+AR := $(TOOLCHAIN_PREFIX)/bin/llvm-ar
 
 CFLAGS := -std=c11 -O3 -fvisibility=hidden -I./include -fpic -fomit-frame-pointer \
 	-fno-strict-aliasing -funwind-tables -ffunction-sections -fstack-protector \

bridge/docker/build_android/Dockerfile

@@ -1,6 +1,24 @@
-FROM lakoo/android-ndk:28-28.0.2-r17c
+FROM ubuntu:22.04
 
-RUN apt-get update && apt-get install make -y
+ENV DEBIAN_FRONTEND=noninteractive
+
+# basic tools
+RUN apt-get update && apt-get install -y \
+    wget \
+    unzip \
+    openjdk-11-jdk \
+    make \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+# Android NDK r25b (same version as Defold's build server)
+ENV ANDROID_NDK_HOME=/opt/android-ndk-r25b
+RUN cd /opt && \
+    wget -q https://dl.google.com/android/repository/android-ndk-r25b-linux.zip && \
+    unzip -q android-ndk-r25b-linux.zip && \
+    rm android-ndk-r25b-linux.zip
+
+ENV PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
 
 VOLUME [ "/repo" ]
 WORKDIR /repo/bridge

fmod/ext.manifest

@@ -12,6 +12,14 @@ platforms:
     context:
       frameworks: ["AVFoundation"]
 
+  armv7-android:
+    context:
+      libs: ["fmodbridge"]
+
+  arm64-android:
+    context:
+      libs: ["fmodbridge"]
+
   x86_64-win32:
     context:
       libs: ["shlwapi.lib"]