[gnome-builder] Revert "flatpak: bundle flatpak-builder and use it"

[Christian Hergert <chergert src gnome org>]

commit 3b21465c56b0641d80796530efb5da7fc738c0ec
Author: Christian Hergert <chergert redhat com>
Date:   Mon Nov 20 16:06:46 2017 -0800

    Revert "flatpak: bundle flatpak-builder and use it"
    
    This reverts commit dcc12928fb5223742d010539222bf58cd7c9befd.
    
    This broke things, unforutnately.

 build-aux/flatpak/org.gnome.Builder.json           |   11 +----------
 .../flatpak/gbp-flatpak-application-addin.c        |    8 --------
 src/plugins/flatpak/gbp-flatpak-download-stage.c   |    4 +---
 src/plugins/flatpak/gbp-flatpak-pipeline-addin.c   |    7 -------
 src/plugins/flatpak/gbp-flatpak-runner.c           |    4 ----
 5 files changed, 2 insertions(+), 32 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 994a9cb..b346462 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -610,6 +610,7 @@
                              "--with-system-install-dir=/var/lib/flatpak" ],
             "cleanup": [ "/etc/profile.d",
                          "/bin/flatpak",
+                         "/bin/flatpak-builder",
                          "/libexec",
                          "/lib/systemd",
                          "/share/dbus-1/interfaces/org.freedesktop.*",
@@ -625,16 +626,6 @@
             ]
         },
         {
-            "name": "flatpak-builder",
-            "config-opts": [ "--disable-documentation", "--disable-docbook-docs" ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/flatpak/flatpak-builder.git";
-                }
-            ]
-        },
-        {
             "name": "gnome-builder",
             "buildsystem": "meson",
             "builddir": true,
diff --git a/src/plugins/flatpak/gbp-flatpak-application-addin.c 
b/src/plugins/flatpak/gbp-flatpak-application-addin.c
index 976a726..43016d6 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.c
@@ -1301,16 +1301,8 @@ gbp_flatpak_application_addin_check_sysdeps_async (GbpFlatpakApplicationAddin *s
   g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
 
   task = g_task_new (self, cancellable, callback, user_data);
-  g_task_set_priority (task, G_PRIORITY_LOW);
   g_task_set_source_tag (task, gbp_flatpak_application_addin_check_sysdeps_async);
 
-  if (ide_is_flatpak ())
-    {
-      /* We can use bundled flatpak-builder in flatpak */
-      g_task_return_boolean (task, TRUE);
-      IDE_EXIT;
-    }
-
   launcher = ide_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE);
   ide_subprocess_launcher_set_clear_env (launcher, FALSE);
   ide_subprocess_launcher_set_run_on_host (launcher, TRUE);
diff --git a/src/plugins/flatpak/gbp-flatpak-download-stage.c 
b/src/plugins/flatpak/gbp-flatpak-download-stage.c
index 4a6df7d..b078608 100644
--- a/src/plugins/flatpak/gbp-flatpak-download-stage.c
+++ b/src/plugins/flatpak/gbp-flatpak-download-stage.c
@@ -71,9 +71,7 @@ gbp_flatpak_download_stage_query (IdeBuildStage    *stage,
       launcher = ide_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE |
                                               G_SUBPROCESS_FLAGS_STDERR_PIPE);
 
-      /* Use our bundled flatpak-builder when possible */
-      ide_subprocess_launcher_set_run_on_host (launcher, !ide_is_flatpak ());
-
+      ide_subprocess_launcher_set_run_on_host (launcher, TRUE);
       ide_subprocess_launcher_set_clear_env (launcher, FALSE);
       ide_subprocess_launcher_set_cwd (launcher, src_dir);
 
diff --git a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c 
b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
index eb43922..9e65744 100644
--- a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
@@ -278,13 +278,6 @@ register_dependencies_stage (GbpFlatpakPipelineAddin  *self,
 
   ide_subprocess_launcher_set_cwd (launcher, src_dir);
 
-  /* If we're running inside of flatpak, we can use our bundled
-   * flatpak-builder instead of relying on the host. It knows how
-   * to run processes via the same HostCommand service.
-   */
-  if (ide_is_flatpak ())
-    ide_subprocess_launcher_set_run_on_host (launcher, FALSE);
-
   ide_subprocess_launcher_push_argv (launcher, "flatpak-builder");
   ide_subprocess_launcher_push_argv (launcher, "--ccache");
   ide_subprocess_launcher_push_argv (launcher, "--force-clean");
diff --git a/src/plugins/flatpak/gbp-flatpak-runner.c b/src/plugins/flatpak/gbp-flatpak-runner.c
index 11b422b..758e0a0 100644
--- a/src/plugins/flatpak/gbp-flatpak-runner.c
+++ b/src/plugins/flatpak/gbp-flatpak-runner.c
@@ -69,10 +69,6 @@ gbp_flatpak_runner_fixup_launcher (IdeRunner             *runner,
     {
       const gchar *manifest_path = gbp_flatpak_configuration_get_manifest_path (GBP_FLATPAK_CONFIGURATION 
(configuration));
 
-      /* Use our bundled flatpak-builder when possible */
-      if (ide_is_flatpak ())
-        ide_subprocess_launcher_set_run_on_host (launcher, FALSE);
-
       ide_subprocess_launcher_insert_argv (launcher, i++, "flatpak-builder");
       ide_subprocess_launcher_insert_argv (launcher, i++, "--run");
       ide_subprocess_launcher_insert_argv (launcher, i++, "--allow=devel");