mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android build script: minor adjustments

Browse source 
When retrying a clean build several libraries failed to build and I
finally tracked this down to the cross build tools not finding their
sysroot.

Also, on my main build server I have an older cmake version and one of the
tools claims to require cmake 3 but I see no actual incompatibility, so
I'm patching out that check.

Hackish? Yes. But it seems to work.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-07-15 10:32:48 -07:00
parent a5b378bdf4
commit eb9f07c789
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packaging/android/build.sh
View file

@ -43,6 +43,11 @@ export PREFIX=${BUILDROOT}/ndk-$ARCH/sysroot/usr
export PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig export PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig
export CC=${BUILDROOT}/ndk-$ARCH/bin/${BUILDCHAIN}-gcc export CC=${BUILDROOT}/ndk-$ARCH/bin/${BUILDCHAIN}-gcc
export CXX=${BUILDROOT}/ndk-$ARCH/bin/${BUILDCHAIN}-g++ export CXX=${BUILDROOT}/ndk-$ARCH/bin/${BUILDCHAIN}-g++
# autoconf seems to get lost without this
export SYSROOT=${BUILDROOT}/ndk-$ARCH/sysroot
export CFLAGS="--sysroot=${SYSROOT}"
export CPPFLAGS="--sysroot=${SYSROOT}"
export CXXFLAGS="--sysroot=${SYSROOT}"
# Junk needed for qt-android-cmake # Junk needed for qt-android-cmake
export ANDROID_STANDALONE_TOOLCHAIN=${BUILDROOT}/ndk-$ARCH export ANDROID_STANDALONE_TOOLCHAIN=${BUILDROOT}/ndk-$ARCH
export JAVA_HOME=/usr export JAVA_HOME=/usr
@ -205,6 +210,9 @@ else
git pull -u git pull -u
popd popd
fi fi
# hack the CMake minimum version dependency - I have seen no indication
# that this is actually correct, anyway...
sed -i "s/cmake_minimum_required/#cmake_minimum_required/ ; s/cmake_policy.SET CMP0026/#cmake_policy(SET CMP0026/" qt-android-cmake/AddQtAndroidApk.cmake
# Should we build the mobile ui or the desktop ui? # Should we build the mobile ui or the desktop ui?
if [ ! -z "$SUBSURFACE_MOBILE" ] ; then if [ ! -z "$SUBSURFACE_MOBILE" ] ; then