Merge branch 'WD_1.X_dev' of https://portal-ua.globallogic.com/git/wd into WD_1.X_dev

Author: nataliakoval

build.sh

@@ -28,7 +28,7 @@ else
 fi
 
 OUT_STATIC_LIB_FILES="libchromium_base.a libWebDriver_core.a libWebDriver_extension_qt_base.a libWebDriver_extension_qt_web.a libWebDriver_extension_qt_quick.a libWebDriver_extension_qt_quick_web.a"
-OUT_SHARED_LIB_FILES="libchromium_base.so libWebDriver_core.so libWebDriver_extension_qt_base.so libWebDriver_extension_qt_web.so libWebDriver_extension_qt_quick.so libWebDriver_extension_qt_quick_web.so libWebDriver_noWebkit_android.so"
+OUT_SHARED_LIB_FILES="libchromium_base.so libWebDriver_core.so libWebDriver_extension_qt_base.so libWebDriver_extension_qt_web.so libWebDriver_extension_qt_quick.so libWebDriver_extension_qt_quick_web.so libAndroidWD.so"
 OUT_BIN_FILES="WebDriver WebDriver_noWebkit WebDriver_noWebkit_sharedLibs"
 GYP=`which gyp`
 

build_android.sh

@@ -5,30 +5,10 @@ archs=$1
 
 if [ -z $QT_DIR ]
 then
-  export QT_DIR=/opt/Qt5.1/5.1.0
+  export QT_DIR=/opt/Qt5.2/5.2.0
 fi
 
-if [ -z $QT_DESK_DIR ]
-then
-  export QT_DESK_DIR=/opt/Qt5.1/5.1.0/gcc
-fi
-
-echo "####################### Build androiddeployqt #######################"
-export QT_DESK_QMAKE=$QT_DESK_DIR/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
-RETVAL=$?
-if [ $RETVAL -ne 0 ];
-then
-  echo "####################### Build androiddeployqt failed !!! #######################"
-  exit $RETVAL
-fi
-cd -
-
-export ANDROID_DEPLOY_QT=$ANDROID_DEPLOY_QT_PATH/androiddeployqt
+export QT_VERSION=5.2.0
 export ANDROID_PACKAGE=org.webdriver.qt
 export ANDROID_JAVA=`pwd`/platform/android/java/
 export ANDROID_APP_NAME=AndroidWD
@@ -91,6 +71,8 @@ do
   export LINK=$BIN/$ANDROID_TOOL_PREFIX-g++
   export AR=$BIN/$ANDROID_TOOL_PREFIX-ar
 
+  export ANDROID_DEPLOY_QT=$QT_DIR/android_$arch/bin/androiddeployqt
+
 
   export GYP_DEFINES="OS=android"
 
@@ -115,7 +97,7 @@ fi
     fi
 
     dist_dir=`pwd`/out/bin/$platform/$mode
-    export BINARY_PATH=$dist_dir/libWebDriver_noWebkit_android.so
+    export BINARY_PATH=$dist_dir/libAndroidWD.so
 
     #clean android directory
     rm -rf $dist_dir/android
@@ -144,7 +126,7 @@ fi
     fi
 
     cp $dist_dir/android/bin/QtApp-release.apk $dist_dir/AndroidWD.apk
-    rm -rf $dist_dir/android
+    # rm -rf $dist_dir/android
 
   done
 

generate_android_json.py

@@ -14,7 +14,7 @@
 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-package-source-directory\": \"" +os.environ['ANDROID_JAVA'] +"\",\n")
 jsonfile.write("\"android-app-name\": \"" +os.environ['ANDROID_APP_NAME'] +"\"\n")
 jsonfile.write("}")
 jsonfile.close()