diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2020-02-12 17:44:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 17:44:53 +0100 |
| commit | 43d3473d64ecaf187af7a3fd07f27d828dd908c9 (patch) | |
| tree | dbe9649b82e222809c91d466e94cc2d2e0e1a2d0 /scripts | |
| parent | 6e5b65ae94faad1e992858605c76b8ec388c8750 (diff) | |
| download | navit-43d3473d64ecaf187af7a3fd07f27d828dd908c9.tar.gz | |
fix:change:Disable CXX on the the build_script as wellv0.5.4-fdroid.3
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_android.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build_android.sh b/scripts/build_android.sh index 6512dab1f..836ead59b 100755 --- a/scripts/build_android.sh +++ b/scripts/build_android.sh @@ -17,7 +17,7 @@ # If any of the build steps fails, this script aborts with an error immediately. echo Set up environment -set - e +set -e export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin export JVM_OPTS="-Xmx3200m" export GRADLE_OPTS='-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' @@ -28,7 +28,7 @@ export GRADLE_OPTS='-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryEr echo Run CMake test -z "$PKG_CONFIG_LIBDIR" && export PKG_CONFIG_LIBDIR="" # Force cmake below to run ignore build host libraries when using pkgconfig. # Note: If you want to compile against specific target libraries that are searched using pkgconfig, please run this script with variable PKG_CONFIG_LIBDIR set to the appropriate path -cmake ./ -Dvehicle/gpsd_dbus:BOOL=FALSE -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 -DXSL_PROCESSING=y -DXSLTS=android -DANDROID=y || exit 1 +cmake ./ -Dvehicle/gpsd_dbus:BOOL=FALSE -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 -DXSL_PROCESSING=y -DXSLTS=android -DANDROID=y -DDISABLE_CXX=y || exit 1 echo Process icons pushd navit/icons |