Rework android apk generating

Author: dteteruk

build_android.sh

@@ -3,6 +3,30 @@
 
 archs=$1
 
+if [ -z $QT_DIR ]
+then
+  export QT_DIR=/opt/Qt5.1/5.1.0
+fi
+
+echo "####################### Build androiddeployqt #######################"
+export QT_DESK_QMAKE=$QT_DIR/gcc/bin/qmake
+export ANDROID_DEPLOY_QT_PATH=./platform/android/androiddeployqt
+
+cd $ANDROID_DEPLOY_QT_PATH
+$QT_DESK_QMAKE androiddeployqt.pro -r -spec linux-g++
+make
+cd -
+
+export ANDROID_DEPLOY_QT=$ANDROID_DEPLOY_QT_PATH/androiddeployqt
+export ANDROID_PACKAGE=org.webdriver.qt
+export ANDROID_JAVA=/home/dmytro/Chromium/wd_working/platform/android/java/
+export ANDROID_APP_NAME=AndroidWD
+export MINISTRO="--deployment ministro"
+
+export KEY_STORE=`pwd`/platform/android/androidwd.keystore
+export ALIAS="qtwd"
+export PASSWORD="123456"
+
 if [ -z $archs ];
 then
   archs="armv7 x86"
@@ -19,27 +43,28 @@ then
   export ANDROID_SDK_ROOT=/opt/android/adt-bundle-linux-x86-20130522/sdk
 fi
 
-if [ -z $QT_DIR ]
-then
-  export QT_DIR=/opt/Qt5.1/5.1.0
-fi
-
 for arch in $archs
 do
   if [ $arch = "x86" ];
   then
-    export ANDROID_ARCH=arch-x86
+    export ANDROID_ARCH=x86
     export ANDROID_LIB_ARCH=x86
+    export ANDROID_TOOLCHAIN_VERSION=4.7
     export ANDROID_TOOLCHAIN=x86-4.7
     export ANDROID_TOOL_PREFIX=i686-linux-android
     export ANDROID_TARGET=android-10
+    export ANDROID_TOOLCHAIN_PREFIX=x86
+    export ANDROID_NDK_HOST=linux-x86
   elif [ $arch = "armv7" ];
   then
-    export ANDROID_ARCH=arch-arm
+    export ANDROID_ARCH=arm
     export ANDROID_LIB_ARCH=armeabi-v7a
+    export ANDROID_TOOLCHAIN_VERSION=4.7
     export ANDROID_TOOLCHAIN=arm-linux-androideabi-4.7
     export ANDROID_TOOL_PREFIX=arm-linux-androideabi
     export ANDROID_TARGET=android-10
+    export ANDROID_TOOLCHAIN_PREFIX=arm-linux-androideabi
+    export ANDROID_NDK_HOST=linux-x86
   else
     echo "We don't support platform " $arch
     exit 1
@@ -79,8 +104,27 @@ fi
     fi
 
     dist_dir=`pwd`/out/bin/$platform/$mode
+    export BINARY_PATH=$dist_dir/libWebDriver_noWebkit_android.so
+
+    #clean android directory
+    rm -rf $dist_dir/android
+
+    
     echo "####################### Create apk "$arch" "$mode" #######################"
-    python generate_apk.py $dist_dir $mode
+    mkdir -p $dist_dir/android/libs/$ANDROID_LIB_ARCH
+    cp $BINARY_PATH $dist_dir/android/libs/$ANDROID_LIB_ARCH
+
+    export ANDROID_JSON_CONFIG=$dist_dir/android/android_config.json 
+    python generate_android_json.py
+
+    if [ $mode = "release" ]
+    then
+      export RELEASE_ARG="--sign "$KEY_STORE" "$ALIAS" --storepass "$PASSWORD
+      echo $RELEASE_ARG
+    fi
+
+    $ANDROID_DEPLOY_QT --output $dist_dir/android --input $ANDROID_JSON_CONFIG --verbose $MINISTRO $RELEASE_ARG 
+
   done
 
 done

generate_android_json.py

@@ -0,0 +1,21 @@
+import os
+
+filename = os.environ['ANDROID_JSON_CONFIG']
+
+jsonfile = open (filename, 'w')
+jsonfile.write("{\n")
+jsonfile.write("\"qt\": \"" +os.environ['QT_ROOT'] +"\",\n")
+jsonfile.write("\"sdk\": \"" +os.environ['ANDROID_SDK_ROOT'] +"\",\n")
+jsonfile.write("\"ndk\": \"" +os.environ['ANDROID_NDK_ROOT'] +"\",\n")
+jsonfile.write("\"toolchain-prefix\": \"" +os.environ['ANDROID_TOOLCHAIN_PREFIX'] +"\",\n")
+jsonfile.write("\"tool-prefix\": \"" +os.environ['ANDROID_TOOL_PREFIX'] +"\",\n")
+jsonfile.write("\"toolchain-version\": \"" +os.environ['ANDROID_TOOLCHAIN_VERSION'] +"\",\n")
+jsonfile.write("\"ndk-host\": \"" +os.environ['ANDROID_NDK_HOST'] +"\",\n")
+jsonfile.write("\"target-architecture\": \"" +os.environ['ANDROID_LIB_ARCH'] +"\",\n")
+jsonfile.write("\"application-binary\": \"" +os.environ['BINARY_PATH'] +"\",\n")
+jsonfile.write("\"android-package\": \"" +os.environ['ANDROID_PACKAGE'] +"\",\n")
+jsonfile.write("\"android-package-source-directory\": \"" +os.environ['ANDROID_JAVA'] +"\",\n")
+jsonfile.write("\"android-app-name\": \"" +os.environ['ANDROID_APP_NAME'] +"\"\n")
+jsonfile.write("}")
+jsonfile.close()
+

generate_apk.py

@@ -0,0 +1,6 @@
+
+CONFIG += console
+
+SOURCES += \
+    main.cpp
+