diff options
author | Angelo Mantellini <angelo.mantellini@irt-systemx.fr> | 2018-03-21 14:16:02 +0100 |
---|---|---|
committer | Angelo Mantellini <angelo.mantellini@irt-systemx.fr> | 2018-03-21 20:46:00 +0100 |
commit | 5d308865d0783d0cd70f7453c77980835ac5648e (patch) | |
tree | aea91e7109a81669e5b19443296cf1dec6876532 /scripts/compile_androidviper.sh | |
parent | e90a1ec7c82519127b63931a96535ad4bc31342d (diff) |
update android-sdk. Now it is possible to compile with clangandroid-sdk/master
Change-Id: I156aa48dd90467a2a7540eec11839c0111b13bd2
Signed-off-by: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>
Diffstat (limited to 'scripts/compile_androidviper.sh')
-rwxr-xr-x | scripts/compile_androidviper.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/compile_androidviper.sh b/scripts/compile_androidviper.sh index e3f6b0b7..c5fbd83a 100755 --- a/scripts/compile_androidviper.sh +++ b/scripts/compile_androidviper.sh @@ -18,6 +18,7 @@ #!/bin/bash set -e +ANDROID_ARCH=armv7 export ANDROID_HOME=${SDK} export ANDROID_NDK_HOST=${OS}-${ARCH} export ANDROID_NDK_PLATFORM=android-23 @@ -30,14 +31,15 @@ export ANDROID_API_VERSION=android-23 export PATH=$PATH:${ANDROID_HOME}/tools:${JAVA_HOME}/bin echo $QT_HOME cd ${DISTILLERY_ROOT_DIR} +export DISTILLARY_INSTALLATION_PATH=${DISTILLERY_ROOT_DIR}/usr_armv7-a mkdir -p ${DISTILLERY_BUILD_DIR}/viper cd ${DISTILLERY_BUILD_DIR}/viper -${QT_HOME}/5.7/android_${ANDROID_ARCH}/bin/qmake -r -spec android-g++ ${DISTILLERY_ROOT_DIR}/src/viper/viper.pro "TRANSPORT_LIBRARY = ICNET" +${QT_HOME}/5.8/android_${ANDROID_ARCH}/bin/qmake -r -spec android-g++ ${DISTILLERY_ROOT_DIR}/src/viper/viper.pro make make install INSTALL_ROOT=viper-${ANDROID_ARCH} if [ "$1" = "DEBUG" ]; then - ${QT_HOME}/5.7/android_${ANDROID_ARCH}/bin/androiddeployqt --output viper-${ANDROID_ARCH} --verbose --input android-libviper.so-deployment-settings.json --gradle --android-platform android-23 --stacktrace --debug --target android-23 --debug --sign ${DISTILLERY_ROOT_DIR}/src/viper/android/viper.keystore viper --storepass icn_viper + ${QT_HOME}/5.8/android_${ANDROID_ARCH}/bin/androiddeployqt --output viper-${ANDROID_ARCH} --verbose --input android-libviper.so-deployment-settings.json --gradle --android-platform android-23 --stacktrace --debug --target android-23 --debug --sign ${DISTILLERY_ROOT_DIR}/src/viper/android/viper.keystore viper --storepass icn_viper else - ${QT_HOME}/5.7/android_${ANDROID_ARCH}/bin/androiddeployqt --output viper-${ANDROID_ARCH} --verbose --input android-libviper.so-deployment-settings.json --gradle --android-platform android-23 --stacktrace --debug --target android-23 --release --sign ${DISTILLERY_ROOT_DIR}/src/viper/android/viper.keystore viper --storepass icn_viper + ${QT_HOME}/5.8/android_${ANDROID_ARCH}/bin/androiddeployqt --output viper-${ANDROID_ARCH} --verbose --input android-libviper.so-deployment-settings.json --gradle --android-platform android-23 --stacktrace --debug --target android-23 --release --sign ${DISTILLERY_ROOT_DIR}/src/viper/android/viper.keystore viper --storepass icn_viper fi -cd ..
\ No newline at end of file +cd .. |