diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-15 10:32:48 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-15 10:37:57 -0700 |
| commit | eb9f07c7891a509e0d7cd97a9d2cd5ca0b77e188 (patch) | |
| tree | 1da6c0b24d5cfe18d24fd2de249be3e8de42d1ae | |
| parent | a5b378bdf4fef6285e2048ab974f8cff31397cbd (diff) | |
| download | subsurface-eb9f07c7891a509e0d7cd97a9d2cd5ca0b77e188.tar.gz | |
Android build script: minor adjustments
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>
| -rw-r--r-- | packaging/android/build.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 2fa9a7fe6..c96f861eb 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -43,6 +43,11 @@ export PREFIX=${BUILDROOT}/ndk-$ARCH/sysroot/usr export PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig export CC=${BUILDROOT}/ndk-$ARCH/bin/${BUILDCHAIN}-gcc 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 export ANDROID_STANDALONE_TOOLCHAIN=${BUILDROOT}/ndk-$ARCH export JAVA_HOME=/usr @@ -205,6 +210,9 @@ else git pull -u popd 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? if [ ! -z "$SUBSURFACE_MOBILE" ] ; then |