# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1270817510 18000
# Node ID e0412d845ffbeadbc28237149c33349ea5f8c1b7
# Parent  9efa81cf79bf417bce83bd3775b2ddb279a4914d# Parent  00adbfb5e5c4bc682a991bd6148af59a505323bb
Merge commit

diff -r 9efa81cf79bf -r e0412d845ffb core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Thu Apr 08 15:26:35 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Fri Apr 09 07:51:50 2010 -0500
@@ -300,6 +300,9 @@
 					String baseBuildPlatform = null;
 					if (parentNode != null){
 						baseBuildPlatform = parentNode.getAttributes().getNamedItem("name").getNodeValue();
+						if (baseBuildPlatform.split("_").length > 1){
+							baseBuildPlatform = baseBuildPlatform.split("_")[0];
+						}
 					}
 					
 					// only support configs that fall into something we can make a build context