diff --git a/system-images/android/sdk/build-cmake b/system-images/android/sdk/build-cmake index e40ce70..dd93966 100755 --- a/system-images/android/sdk/build-cmake +++ b/system-images/android/sdk/build-cmake @@ -1,26 +1,23 @@ #!/bin/bash set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" name=$1 shift url=$1 shift ARGS= -if [ "$STANDALONE_CC" = "clang" ]; then - ARGS+=" -DCMAKE_ANDROID_STL_TYPE=c++_shared" -fi $DIR/build-cmake-native $name $url \ - $ARGS \ -DCMAKE_INSTALL_PREFIX=${APP_INSTALL_PREFIX-"/opt/kdeandroid-deps"} \ -DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/kdeandroid-deps;$APP_INSTALL_PREFIX" \ -DCMAKE_BUILD_TYPE=debug \ -DCMAKE_TOOLCHAIN_FILE=/opt/kdeandroid-deps/share/ECM/toolchain/Android.cmake \ -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=$ANDROID_NDK_TOOLCHAIN_VERSION \ -DCMAKE_ANDROID_API=${ANDROID_NDK_PLATFORM:8} \ + -DCMAKE_ANDROID_STL_TYPE=c++_shared \ -DKF5_HOST_TOOLING=/opt/nativetooling/lib/x86_64-linux-gnu/cmake/ \ $@