Home
Phabricator
Search
Log In
Files
F7663535
buildAll64.patch
timotheegiet (Timothée Giet)
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Author
timotheegiet
Created
Oct 24 2019, 1:48 PM
Size
1 KB
Mime Type
text/x-diff
Engine
blob
Format
Raw Data
Handle
4913365
Attached To
D24863: GCompris compilation with gradle
buildAll64.patch
View Options
--- tools/android_build_all_apk_64.sh 2019-10-23 15:42:55.240209243 +0200
+++ tools/android_build_all_apk_64.sh 2019-10-24 15:46:34.554280695 +0200
@@ -20,8 +20,11 @@
# Uncomment if this is not already done
# make getSvnTranslations
-Qt5_BaseDIR=~/Qt5.12.1/5.12.1
+Qt5_BaseDIR=~/Qt/5.12.5
export ANDROID_NDK_ROOT=$ANDROID_NDK
+export ANDROID_ARCH=arm64
+export ANDROID_ARCH_ABI=arm64-v8a
+export Qt5_android=${Qt5_BaseDIR}/${QtTarget}/
# The current version
version=$(sed -n -e 's/set(GCOMPRIS_MINOR_VERSION \([0-9]\+\)).*/\1/p' CMakeLists.txt)
@@ -58,10 +61,8 @@
fi
cmake -DCMAKE_TOOLCHAIN_FILE=/usr/share/ECM/toolchain/Android.cmake \
- -DCMAKE_ANDROID_API=21 \
+ -DCMAKE_ANDROID_API=22 \
-DCMAKE_BUILD_TYPE=release \
- -DCMAKE_ANDROID_STL_TYPE=c++_shared \
- -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang \
-DANDROID_ARCHITECTURE=$1 \
-DQt5_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5 \
-DQt5Qml_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Qml \
@@ -94,13 +95,12 @@
cd ${builddir}
f_cmake arm64 inapp OFF ON OFF
-make
+make -j 4
make BuildTranslations
make apk_release && make apk_signed && make apk_signed_aligned
-
f_cmake arm64 no OFF ON OFF
-make
+make -j 4
make apk_release && make apk_signed && make apk_signed_aligned
Log In to Comment