libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 08:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUILD: Android build fixes for OSX

Browse Source
This commit is contained in:
Dries Harnie 2020-04-06 17:06:41 +02:00
parent b4d0b8eee6
commit 0e1ac9b46c
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis/android-build
View File

@ -24,5 +24,6 @@ echo ">>> Creating final APK"
# Now copy the ARMv7 one into the ARM64 tree and build the final package from there
[ ! -d build ] && ln -s build-arm64-v8a build
export ANDROID_VERSIONCODE=$((40000 + ${TRAVIS_BUILD_NUMBER:-0}))
install -C -D -m 644 build-armeabi-v7a/libresidualvm.so build/android/jni/armeabi-v7a/libresidualvm.so
mkdir -p build/android/jni/armeabi-v7a
install -C -m 644 build-armeabi-v7a/libresidualvm.so build/android/jni/armeabi-v7a/libresidualvm.so
TERM=dumb make -C build androidrelease ABI=arm64-v8a

8
.travis/android-set-environment
View File

@ -1,5 +1,9 @@
#!/bin/sh
export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64
if uname -s | grep -qi linux; then
export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64
elif uname -s | grep -qi darwin; then
export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/darwin-x86_64
fi
export ANDROID_LEVEL=${ANDROID_LEVEL:-26}
export ANDROID_TARGET_VERSION=${ANDROID_LEVEL}
if [ "$CROSS_HOST" = "armv7a-linux-androideabi" ]; then
@ -21,5 +25,5 @@ export STRIP=$TOOLCHAIN/bin/${CROSS_HOST}-strip
export PATH=$TOOLCHAIN/bin:$ANDROID_NDK:$PATH
export CXXFLAGS=-Wno-inconsistent-missing-override
NPROC=$(nproc 2>/dev/null)
NPROC=$(nproc 2>/dev/null || echo "")
export MAKEFLAGS="-j${NPROC:-4}"

5
backends/platform/android/android.mk
View File

@ -29,10 +29,11 @@ ifdef USE_OPENGL_SHADERS
endif
$(PATH_BUILD):
$(MKDIR) -p $(PATH_BUILD_ASSETS)
$(INSTALL) -d $(PATH_BUILD_ASSETS)
$(PATH_BUILD_JNI): libresidualvm.so
$(INSTALL) -C -D -m 644 libresidualvm.so $(PATH_BUILD_JNI)
$(INSTALL) -d $(dir $(PATH_BUILD_JNI))
$(INSTALL) -C -m 644 libresidualvm.so $(PATH_BUILD_JNI)
$(PATH_BUILD_GRADLE): $(PATH_BUILD_ASSETS) $(PATH_DIST)/build.gradle
$(eval ABIS = $(notdir $(wildcard $(PATH_BUILD)/jni/*)))

2
configure vendored
View File

@ -1805,7 +1805,7 @@ android)
echo "Please set ANDROID_NDK in your environment. export ANDROID_NDK=<path to Android NDK>"
exit 1
fi
ndk_version=$(sed -En -e 's/^Pkg.Revision\s*=\s*([0-9a-f]+).*/\1/p' "$ANDROID_NDK/source.properties")
ndk_version=$(sed -En -e 's/^Pkg.Revision *= *([0-9a-f]+).*/\1/p' "$ANDROID_NDK/source.properties")
if [ -z "$ndk_version" -o "$ndk_version" -lt 18 ]; then
echo "Need Android NDK r18 or later to compile! Found version '$ndk_version'"
exit 1