Add qbs files for android

Change-Id: I1739879579245303795fc7c6d5bc2206ffb44bcb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

qbs/pluginspec/pluginspec.qbs

@@ -11,6 +11,9 @@ Module {
     property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
     property string destdir: product.destination
 
+    property var pluginspecreplacements: product.pluginspecreplacements
+
+
     FileTagger {
         pattern: "*.in"
         fileTags: ["pluginSpecIn"]
@@ -37,9 +40,12 @@ Module {
             cmd.ide_version_major = product.module.ide_version_major;
             cmd.ide_version_minor = product.module.ide_version_minor;
             cmd.ide_version_release = product.module.ide_version_release;
+
+            cmd.pluginspecreplacements = product.module.pluginspecreplacements;
+
             cmd.sourceCode = function() {
                 var i;
-                var vars = {};
+                var vars = pluginspecreplacements || {};
                 var inf = new TextFile(input.fileName);
                 var all = inf.readAll();
                 // replace quoted quotes

qtcreator.qbp

@@ -26,6 +26,7 @@ Project {
         "src/libs/utils/utils.qbs",
         "src/libs/zeroconf/zeroconf.qbs",
         "src/plugins/analyzerbase/analyzerbase.qbs",
+        "src/plugins/android/android.qbs",
         "src/plugins/bazaar/bazaar.qbs",
         "src/plugins/bineditor/bineditor.qbs",
         "src/plugins/bookmarks/bookmarks.qbs",

src/plugins/QtcPlugin.qbs

@@ -4,6 +4,7 @@ import qbs.fileinfo 1.0 as FileInfo
 Product {
     type: ["dynamiclibrary", "pluginSpec"]
     property string provider: 'Nokia'
+    property var pluginspecreplacements
     destination: "lib/qtcreator/plugins/" + provider
     targetName: {
         // see PluginSpecPrivate::loadLibrary()

src/plugins/android/android.qbs

@@ -0,0 +1,85 @@
+import qbs.base 1.0
+
+import "../QtcPlugin.qbs" as QtcPlugin
+
+QtcPlugin {
+    name: "Android"
+
+    Depends { name: "Core" }
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "Qt4ProjectManager" }
+    Depends { name: "Debugger" }
+    Depends { name: "QtSupport" }
+    Depends { name: "qt"; submodules: ['widgets', 'xml', 'network'] }
+
+    property bool enable: false
+    property var pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")})
+
+    cpp.includePaths: [
+        "..",
+        buildDirectory,
+        "../../libs",
+        "../../shared"
+    ]
+
+    files: [
+        "addnewavddialog.ui",
+        "androidconfigurations.cpp",
+        "androidconfigurations.h",
+        "androidconstants.h",
+        "androidcreatekeystorecertificate.cpp",
+        "androidcreatekeystorecertificate.h",
+        "androidcreatekeystorecertificate.ui",
+        "androiddebugsupport.cpp",
+        "androiddebugsupport.h",
+        "androiddeployconfiguration.cpp",
+        "androiddeployconfiguration.h",
+        "androiddeploystep.cpp",
+        "androiddeploystepfactory.cpp",
+        "androiddeploystepfactory.h",
+        "androiddeploystep.h",
+        "androiddeploystepwidget.cpp",
+        "androiddeploystepwidget.h",
+        "androiddeploystepwidget.ui",
+        "androidglobal.h",
+        "androidpackagecreationfactory.cpp",
+        "androidpackagecreationfactory.h",
+        "androidpackagecreationstep.cpp",
+        "androidpackagecreationstep.h",
+        "androidpackagecreationwidget.cpp",
+        "androidpackagecreationwidget.h",
+        "androidpackagecreationwidget.ui",
+        "androidpackageinstallationfactory.cpp",
+        "androidpackageinstallationfactory.h",
+        "androidpackageinstallationstep.cpp",
+        "androidpackageinstallationstep.h",
+        "androidplugin.cpp",
+        "androidplugin.h",
+        "android.qrc",
+        "androidqtversion.cpp",
+        "androidqtversionfactory.cpp",
+        "androidqtversionfactory.h",
+        "androidqtversion.h",
+        "androidrunconfiguration.cpp",
+        "androidrunconfiguration.h",
+        "androidruncontrol.cpp",
+        "androidruncontrol.h",
+        "androidrunfactories.cpp",
+        "androidrunfactories.h",
+        "androidrunner.cpp",
+        "androidrunner.h",
+        "androidsettingspage.cpp",
+        "androidsettingspage.h",
+        "androidsettingswidget.cpp",
+        "androidsettingswidget.h",
+        "androidsettingswidget.ui",
+        "androidtarget.cpp",
+        "androidtargetfactory.cpp",
+        "androidtargetfactory.h",
+        "androidtarget.h",
+        "androidtoolchain.cpp",
+        "androidtoolchain.h",
+        "javaparser.cpp",
+        "javaparser.h"
+    ]
+}

src/plugins/qtsupport/qtsupport.qbs

@@ -81,5 +81,16 @@ QtcPlugin {
         "qtversionfactory.cpp",
         "qtversionmanager.cpp"
     ]
+
+    ProductModule {
+        Depends { name: "cpp" }
+        cpp.defines: [
+            "PROPARSER_AS_LIBRARY",
+            "PROPARSER_LIBRARY",
+            "PROPARSER_THREAD_SAFE",
+            "PROEVALUATOR_THREAD_SAFE",
+            "PROEVALUATOR_CUMULATIVE"
+        ]
+    }
 }