[gnome-builder/gnome-builder-3-24] flatpak: use build-args to flatpak-build

[Christian Hergert <chergert src gnome org>]

commit 80cea84e4e29fdb03b3de2d41dc2e1e2c2a2f8de
Author: Christian Hergert <chergert redhat com>
Date:   Wed Mar 29 18:16:16 2017 -0600

    flatpak: use build-args to flatpak-build
    
    We don't need to worry about finish-args here, because that is dealt with
    in GbpFlatpakRunner and a generic IdeSubprocessLauncher.

 plugins/flatpak/gbp-flatpak-runtime.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-runtime.c b/plugins/flatpak/gbp-flatpak-runtime.c
index 383886c..f7d4baf 100644
--- a/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/plugins/flatpak/gbp-flatpak-runtime.c
@@ -136,6 +136,7 @@ gbp_flatpak_runtime_create_launcher (IdeRuntime  *runtime,
       g_autofree gchar *ccache_dir = NULL;
       g_auto(GStrv) new_environ = NULL;
       const gchar *builddir = NULL;
+      const gchar * const *build_args = NULL;
       GFile *project_file;
       IdeContext *context;
       IdeConfigurationManager *config_manager;
@@ -173,7 +174,14 @@ gbp_flatpak_runtime_create_launcher (IdeRuntime  *runtime,
       /* Add 'flatpak build' and the specified arguments to the launcher */
       ide_subprocess_launcher_push_argv (ret, "flatpak");
       ide_subprocess_launcher_push_argv (ret, "build");
-      ide_subprocess_launcher_push_argv (ret, "--share=network");
+
+      if (GBP_IS_FLATPAK_CONFIGURATION (configuration))
+        build_args = gbp_flatpak_configuration_get_build_commands (GBP_FLATPAK_CONFIGURATION 
(configuration));
+
+      if (build_args != NULL)
+        ide_subprocess_launcher_push_args (ret, build_args);
+      else
+        ide_subprocess_launcher_push_argv (ret, "--share=network");
 
       /* We might need access to ccache configs inside the build environ.
        * Usually, this is set by flatpak-builder, but since we are running