[gnome-builder/gnome-builder-3-40] deviced: Use the correct triplet

[Christian Hergert <chergert src gnome org>]

commit 96732a85dcf52ef84a0ee347846eb44ad4b0b8d8
Author: James Westman <james jwestman net>
Date:   Wed Apr 21 23:16:32 2021 -0500

    deviced: Use the correct triplet
    
    Use the device's triplet, not the host triplet, when building the
    flatpak bundle to deploy to the device.

 src/plugins/deviced/gbp-deviced-deploy-strategy.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/src/plugins/deviced/gbp-deviced-deploy-strategy.c 
b/src/plugins/deviced/gbp-deviced-deploy-strategy.c
index 77eda6f72..86016ee40 100644
--- a/src/plugins/deviced/gbp-deviced-deploy-strategy.c
+++ b/src/plugins/deviced/gbp-deviced-deploy-strategy.c
@@ -190,9 +190,7 @@ deploy_get_commit_cb (GObject      *object,
   g_autofree gchar *staging_dir = NULL;
   g_autoptr(IdeSubprocess) subprocess = NULL;
   g_autoptr(GError) error = NULL;
-  g_autoptr(IdeTriplet) triplet = NULL;
   IdeConfig *config;
-  IdeToolchain *toolchain;
   const gchar *arch;
   const gchar *app_id;
   DeployState *state;
@@ -213,9 +211,7 @@ deploy_get_commit_cb (GObject      *object,
 
   context = ide_object_get_context (IDE_OBJECT (state->pipeline));
   config = ide_pipeline_get_config (state->pipeline);
-  toolchain = ide_pipeline_get_toolchain (state->pipeline);
-  triplet = ide_toolchain_get_host_triplet (toolchain);
-  arch = ide_triplet_get_arch (triplet);
+  arch = ide_pipeline_get_arch (state->pipeline);
   staging_dir = gbp_flatpak_get_staging_dir (state->pipeline);
   repo_dir = gbp_flatpak_get_repo_dir (context);
   app_id = ide_config_get_app_id (config);
@@ -318,13 +314,11 @@ gbp_deviced_deploy_strategy_deploy_async (IdeDeployStrategy     *strategy,
 {
   GbpDevicedDeployStrategy *self = (GbpDevicedDeployStrategy *)strategy;
   g_autoptr(IdeTask) task = NULL;
-  g_autoptr(IdeTriplet) triplet = NULL;
   IdeConfig *config;
   DeployState *state;
   const gchar *app_id;
   const gchar *arch;
   IdeDevice *device;
-  IdeToolchain *toolchain;
 
   IDE_ENTRY;
 
@@ -337,9 +331,7 @@ gbp_deviced_deploy_strategy_deploy_async (IdeDeployStrategy     *strategy,
 
   config = ide_pipeline_get_config (pipeline);
   device = ide_pipeline_get_device (pipeline);
-  toolchain = ide_pipeline_get_toolchain (pipeline);
-  triplet = ide_toolchain_get_host_triplet (toolchain);
-  arch = ide_triplet_get_arch (triplet);
+  arch = ide_pipeline_get_arch (pipeline);
   app_id = ide_config_get_app_id (config);
 
   g_assert (GBP_IS_FLATPAK_MANIFEST (config));