Fixed Widgets on Android, separated Widgets and QML in WD for Android

cisco-open-source · Jan 27, 2014 · 0925a3b · 0925a3b
1 parent 5fb1329
commit 0925a3b
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 18 deletions.
diff --git a/build.sh b/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 libAndroidWD.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_QML.so libAndroidWD_Widgets.so"
 OUT_BIN_FILES="WebDriver WebDriver_noWebkit WebDriver_noWebkit_sharedLibs"
 GYP=`which gyp`
 

diff --git a/build_android.sh b/build_android.sh
@@ -97,36 +97,60 @@ fi
     fi
 
     dist_dir=`pwd`/out/bin/$platform/$mode
-    export BINARY_PATH=$dist_dir/libAndroidWD.so
+    export BINARY_PATH_WIDGETS=$dist_dir/libAndroidWD_Widgets.so
+    export BINARY_PATH_QML=$dist_dir/libAndroidWD_QML.so
 
     #clean android directory
     rm -rf $dist_dir/android
 
 
     echo "####################### Create apk "$arch" "$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
+    cp $BINARY_PATH_WIDGETS $dist_dir/android/libs/$ANDROID_LIB_ARCH
 
     if [ $mode = "release" ]
     then
       export RELEASE_ARG="--sign "$KEY_STORE" "$ALIAS" --storepass "$PASSWORD
       echo $RELEASE_ARG
     fi
 
+    export ANDROID_JSON_CONFIG=$dist_dir/android/android_config.json 
+
+
+    echo "####################### Widgets #######################"
+    export BINARY_PATH=$BINARY_PATH_WIDGETS
+    python generate_android_json.py
+
     $ANDROID_DEPLOY_QT --output $dist_dir/android --input $ANDROID_JSON_CONFIG --verbose $MINISTRO $RELEASE_ARG 
     RETVAL=$?
     if [ $RETVAL -ne 0 ];
     then
-      echo "####################### androiddeployqt error!!! #######################"
+      echo "####################### androiddeployqt widgets error!!! #######################"
       echo $RETVAL
       exit $RETVAL
     fi
 
-    cp $dist_dir/android/bin/QtApp-release.apk $dist_dir/AndroidWD.apk
-    # rm -rf $dist_dir/android
+    cp $dist_dir/android/bin/QtApp-release.apk $dist_dir/AndroidWD_Widgets.apk
+    rm -rf $dist_dir/android
+
+
+    echo "####################### QML #######################"
+    mkdir -p $dist_dir/android/libs/$ANDROID_LIB_ARCH
+    cp $BINARY_PATH_QML $dist_dir/android/libs/$ANDROID_LIB_ARCH
+    export BINARY_PATH=$BINARY_PATH_QML
+    python generate_android_json.py
+
+    $ANDROID_DEPLOY_QT --output $dist_dir/android --input $ANDROID_JSON_CONFIG --verbose $MINISTRO $RELEASE_ARG 
+    RETVAL=$?
+    if [ $RETVAL -ne 0 ];
+    then
+      echo "####################### androiddeployqt qml error!!! #######################"
+      echo $RETVAL
+      exit $RETVAL
+    fi
+
+    cp $dist_dir/android/bin/QtApp-release.apk $dist_dir/AndroidWD_QML.apk
+    rm -rf $dist_dir/android
 
   done
 

diff --git a/src/Test/main.cc b/src/Test/main.cc
@@ -168,6 +168,7 @@ int main(int argc, char *argv[])
 #endif // QT_VERSION
 #endif // WD_TEST_ENABLE_WEB_VIEW
 
+#ifndef QT_NO_QML
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     // Quick2 extension
     webdriver::ViewCreator* qmlCreator = new webdriver::Quick2ViewCreator();
@@ -197,7 +198,8 @@ int main(int argc, char *argv[])
     //webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::QmlWebViewCmdExecutorCreator());
     #endif
 
-#endif    
+#endif
+#endif //QT_NO_QML
 
     webdriver::ViewFactory::GetInstance()->AddViewCreator(widgetCreator);
 

diff --git a/wd.gyp b/wd.gyp
@@ -70,7 +70,8 @@
         [ 'OS == "android"', {
           'dependencies': [
             'wd_ext_qt.gyp:WebDriver_extension_qt_base',
-            'wd_test.gyp:test_android_WD_noWebkit',
+            'wd_test.gyp:test_android_WD_Widgets',
+            'wd_test.gyp:test_android_WD_QML',
           ],
         } ],
 

diff --git a/wd_test.gyp b/wd_test.gyp
@@ -91,10 +91,6 @@
               '-lQt5Network',
               '-lQt5Gui',
               '-lQt5Core',
-              '-lQt5Quick',
-              '-lQt5Qml',
-              '-lQt5Multimedia',
-              '-lQt5MultimediaWidgets',
               '-lQt5AndroidExtras',
               '-L<(ANDROID_LIB)',
               '-lgnustl_shared',
@@ -260,7 +256,7 @@
         '<(INTERMEDIATE_DIR)/moc_MenuTest.cc',
       ],
       'conditions': [
-        [ '<(QT5) == 1', {
+        [ '<(QT5) == 1 and <(WD_CONFIG_PLAYER) == 1', {
           'sources': [
             'src/Test/VideoTest.h',
             'src/Test/VideoTest.cc',
@@ -406,10 +402,10 @@
         } ],
       ],
     }, {
-      'target_name': 'test_android_WD_noWebkit',
+      'target_name': 'test_android_WD_QML',
       'type': 'shared_library',
 
-      'product_name': 'AndroidWD',
+      'product_name': 'AndroidWD_QML',
 
       'dependencies': [
         'base.gyp:chromium_base',
@@ -418,6 +414,43 @@
         'wd_ext_qt.gyp:WebDriver_extension_qt_quick',
         'test_widgets',
       ],
+      'libraries': [
+        '-lQt5Multimedia',
+        '-lQt5MultimediaWidgets', 
+        '-lQt5Quick',
+        '-lQt5Qml',
+      ],
+
+      'sources': [
+        'src/Test/main.cc',
+        'src/Test/shutdown_command.cc',
+      ],
+
+      'conditions': [
+        [ '<(WD_BUILD_MONGOOSE) == 0', {
+          'sources': [
+            'src/third_party/mongoose/mongoose.c',
+          ],
+        } ],
+      ],
+
+    },
+    {
+      'target_name': 'test_android_WD_Widgets',
+      'type': 'shared_library',
+
+      'product_name': 'AndroidWD_Widgets',
+
+      'dependencies': [
+        'base.gyp:chromium_base',
+        'wd_core.gyp:WebDriver_core',
+        'wd_ext_qt.gyp:WebDriver_extension_qt_base',
+        'test_widgets',
+      ],
+
+      'defines': [ 
+         'QT_NO_QML',
+       ],
 
       'sources': [
         'src/Test/main.cc',