1 files changed, 23 insertions, 15 deletions
diff --git a/src/plugins/android/androidqtsupport.h b/src/plugins/android/androidqtsupport.h
index ec5d5694952..7b8c6bd2b81 100644
--- a/src/plugins/android/androidqtsupport.h
+++ b/src/plugins/android/androidqtsupport.h
@@ -27,19 +27,23 @@
 
 #include "android_global.h"
 
+#include <coreplugin/id.h>
+
 #include <QObject>
-#include <QList>
 
-namespace ProjectExplorer {
-    class DeployConfiguration;
-    class ProcessParameters;
-    class Project;
-    class Target;
-}
+namespace ProjectExplorer { class Target; }
 
 namespace Utils { class FileName; }
 
 namespace Android {
+namespace Constants {
+
+const char AndroidPackageSourceDir[] = "AndroidPackageSourceDir"; // QString
+const char AndroidDeploySettingsFile[] = "AndroidDeploySettingsFile"; // QString
+const char AndroidExtraLibs[] = "AndroidExtraLibs";  // QStringList
+const char AndroidArch[] = "AndroidArch"; // QString
+
+} // namespace Constants
 
 class ANDROID_EXPORT AndroidQtSupport : public QObject
 {
@@ -58,15 +62,19 @@ public:
 
     virtual bool canHandle(const ProjectExplorer::Target *target) const = 0;
     virtual QStringList soLibSearchPath(const ProjectExplorer::Target *target) const = 0;
-    virtual QStringList androidExtraLibs(const ProjectExplorer::Target *target) const = 0;
     virtual QStringList projectTargetApplications(const ProjectExplorer::Target *target) const = 0;
-    virtual Utils::FileName apkPath(const ProjectExplorer::Target *target) const;
-    virtual Utils::FileName androiddeployqtPath(const ProjectExplorer::Target *target) const = 0;
-    virtual Utils::FileName androiddeployJsonPath(const ProjectExplorer::Target *target) const = 0;
-    virtual void manifestSaved(const ProjectExplorer::Target *target) = 0;
-    virtual Utils::FileName manifestSourcePath(const ProjectExplorer::Target *target) = 0;
-    virtual QString deploySettingsFile(const ProjectExplorer::Target *target) const = 0;
-    virtual Utils::FileName packageSourceDir(const ProjectExplorer::Target *target) const = 0;
+
+    virtual QVariant targetData(Core::Id role, const ProjectExplorer::Target *target) const = 0;
+    virtual bool setTargetData(Core::Id role, const QVariant &value,
+                               const ProjectExplorer::Target *target) const = 0;
+
+    virtual bool parseInProgress(const ProjectExplorer::Target *target) const = 0;
+    virtual bool validParse(const ProjectExplorer::Target *target) const = 0;
+    virtual bool extraLibraryEnabled(const ProjectExplorer::Target *target) const = 0;
+    virtual Utils::FileName projectFilePath(const ProjectExplorer::Target *target) const = 0;
+
+    virtual void addFiles(const ProjectExplorer::Target *target, const QString &buildKey,
+                          const QStringList &addedFiles) const = 0;
 };
 
 } // namespace Android