From daf1be845c86acee6f2001a00d1cdcac9c7e48de Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Thu, 3 Sep 2015 15:36:46 -0400
Subject: [PATCH] Bug 476589 - Cannot open a trace file in a post-mortem
 session

Change-Id: I0dbdb864d929f67286a2dbce32748df90b449754
---
 .../.settings/.api_filters                           | 12 ++++++++++++
 .../debug/core/ICDTLaunchConfigurationConstants.java |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 debug/org.eclipse.cdt.debug.core/.settings/.api_filters

diff --git a/debug/org.eclipse.cdt.debug.core/.settings/.api_filters b/debug/org.eclipse.cdt.debug.core/.settings/.api_filters
new file mode 100644
index 00000000000..fe748fc1979
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/.settings/.api_filters
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.cdt.debug.core" version="2">
+    <resource path="src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java" type="org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants">
+        <filter comment="We should have used the original id for backwards-compatibility" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants"/>
+                <message_argument value="ATTR_DEBUGGER_POST_MORTEM_TYPE"/>
+                <message_argument value="org.eclipse.cdt.launch.POST_MORTEM_TYPE"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java
index 4b8b4c5ea21..a0180579598 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java
@@ -279,9 +279,11 @@ public interface ICDTLaunchConfigurationConstants {
 
 	/**         
 	 * Launch configuration attribute key. The value is a String specifying the type of post mortem launch.
+	 * Note that we use the prefix "org.eclipse.cdt.dsf.gdb" for backwards-compatibility.
+	 * See bug 476589.
 	 * @since 7.7
 	 */     
-	public static final String ATTR_DEBUGGER_POST_MORTEM_TYPE = CDT_LAUNCH_ID + ".POST_MORTEM_TYPE"; //$NON-NLS-1$
+	public static final String ATTR_DEBUGGER_POST_MORTEM_TYPE = "org.eclipse.cdt.dsf.gdb" + ".POST_MORTEM_TYPE"; //$NON-NLS-1$  //$NON-NLS-2$
 
 	/**
 	 * Launch configuration attribute value. The key is