diff --git a/app/build.gradle b/app/build.gradle index 1c9b9bad8..08d3b958c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -325,6 +325,21 @@ def buildRustStores = tasks.register('buildRustStores', Exec) { if (!skipRust) android.sourceSets.main.jniLibs.srcDir(rustJniLibsDir) tasks.named('preBuild').configure { dependsOn(buildRustStores) } +def maliBridgeDir = rootProject.file('external/MaliBridge') +def vkbridgeJniLibsDir = layout.buildDirectory.dir('vkbridgeJniLibs') +def buildVkBridgeServer = tasks.register('buildVkBridgeServer', Exec) { + description = 'Builds the Vulkan bridge server (libvkbridge_server.so) with the NDK.' + inputs.dir(new File(maliBridgeDir, 'common')) + inputs.dir(new File(maliBridgeDir, 'server')) + inputs.dir(new File(maliBridgeDir, 'third_party')) + inputs.file(new File(maliBridgeDir, 'scripts/build-server-android.sh')) + outputs.dir(vkbridgeJniLibsDir) + commandLine 'bash', new File(maliBridgeDir, 'scripts/build-server-android.sh').absolutePath, + android.ndkDirectory.absolutePath, vkbridgeJniLibsDir.get().asFile.absolutePath +} +android.sourceSets.main.jniLibs.srcDir(vkbridgeJniLibsDir) +tasks.named('preBuild').configure { dependsOn(buildVkBridgeServer) } + dependencies { implementation "org.opencv:opencv:${trackingPack.OPENCV_VERSION}" implementation 'org.khronos.openxr:openxr_loader_for_android:1.1.49' diff --git a/tools/build_local.sh b/tools/build_local.sh index a980d70a6..4a58f7721 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -40,6 +40,10 @@ if [[ ! -x "${java_dir}/bin/java" ]]; then echo "Java 17 not found at ${java_dir}; set JAVA_HOME." >&2 exit 1 fi +if [[ ! -f "${repo_root}/external/MaliBridge/scripts/build-client-linux.sh" ]]; then + echo "external/MaliBridge is empty; run: git submodule update --init" >&2 + exit 1 +fi if ! command -v docker >/dev/null 2>&1; then echo "Docker is required to cross-compile the glibc ARM64 preload libraries." >&2 exit 1 @@ -137,6 +141,7 @@ docker run --rm --platform linux/amd64 \ -o "$d/libssbs.so" tools/linuxfs/ssbs/ssbs_adapter.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$d/libssbs.so" mkdir -p "$d/usr/local/bin" + external/MaliBridge/scripts/build-client-linux.sh "$d" aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc -O2 -Wall -Wextra -o "$d/usr/local/bin/droiddeck-clipboard" tools/linuxfs/clipboard/clipboard.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$d/usr/local/bin/droiddeck-clipboard" for script in tools/linuxfs/overlay/usr/local/bin/droiddeck-* tools/linuxfs/overlay/usr/local/bin/steam-compatibility; do