Align android package

fastogt · Jan 27, 2015 · 9847617 · 9847617
1 parent 3c4ac44
commit 9847617
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -309,7 +309,7 @@ IF(CPACK_SUPPORT)
         SET(ANDROID_SDK $ENV{ANDROID_SDK})
 
         SET(ANDROID_TARGET_ARCH $ENV{ANDROID_TARGET_ARCH})
-
+        SET(ANDROID_BUILD_TOOLS_REVISION $ENV{ANDROID_BUILD_TOOLS_REVISION})
         CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/install/android/configAndroid.json.in ${PACKAGE_SOURCE_ANDROID}/configAndroid.json @ONLY)
 
         SET(ANDROID_PACKAGE_RELEASE_NAME ${CPACK_PACKAGE_FILE_NAME}.apk)

diff --git a/build/build.sh b/build/build.sh
@@ -16,6 +16,7 @@ createPackage() {
         make install -j2
         make apk_release
         make apk_signed
+	make apk_signed_aligned
     else
         cmake ../../ -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DOS_ARCH=64 -DOPENSSL_USE_STATIC=1 -DPYTHON_ENABLED=1 -DPYTHON_USE_STATIC=1 -DCPACK_GENERATOR="$cpack_generator"
         make install -j2

diff --git a/install/android/AndroidManifest.xml.in b/install/android/AndroidManifest.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest android:versionName="@PROJECT_VERSION@" package="net.@PROJECT_NAME_LOWERCASE@" android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="57">
+<manifest android:versionName="@PROJECT_VERSION@" package="net.@PROJECT_NAME_LOWERCASE@" android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="61">
     <application android:label="@PROJECT_NAME@" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon">
         <activity android:label="@string/app_name"
         android:name="org.qtproject.qt5.android.bindings.QtActivity"