[gnome-builder] flatpak: fix .Debug path translation

[Christian Hergert <chergert src gnome org>]

commit 48bb35d779959837bea4c76802d0f91e2af324b0
Author: Christian Hergert <chergert redhat com>
Date:   Wed Sep 20 13:31:28 2017 -0700

    flatpak: fix .Debug path translation
    
    The self->sdk value will be something like "org.gnome.Sdk/x86_64/master"
    and this expected "org.gnome.Sdk". We already have a way to get just the
    identifier without arch/branch, so we should use that.
    
    This fixes some path translations into debug data paths.

 plugins/flatpak/gbp-flatpak-runtime.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-runtime.c b/plugins/flatpak/gbp-flatpak-runtime.c
index 8c82d45..4620be6 100644
--- a/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/plugins/flatpak/gbp-flatpak-runtime.c
@@ -321,14 +321,18 @@ gbp_flatpak_runtime_get_debug_dir (GbpFlatpakRuntime *self)
 {
   if G_UNLIKELY (self->debug_dir == NULL)
     {
-      const gchar *ids[] = {
-        self->platform,
-        self->sdk,
-      };
+      g_autofree gchar *sdk_name = NULL;
+      const gchar *ids[2];
+
+      sdk_name = gbp_flatpak_runtime_get_sdk_name (self);
+
+      ids[0] = self->platform;
+      ids[1] = sdk_name;
 
       for (guint i = 0; i < G_N_ELEMENTS (ids); i++)
         {
-          g_autofree gchar *name = g_strdup_printf ("%s.Debug", ids[i]);
+          const gchar *id = ids[i];
+          g_autofree gchar *name = g_strdup_printf ("%s.Debug", id);
           g_autofree gchar *deploy_path = NULL;
           g_autofree gchar *path = NULL;