merge commit RCL_2_4
authortimkelly
Thu, 08 Apr 2010 15:47:15 -0500
branchRCL_2_4
changeset 1182 090abdc9b9ee
parent 1180 8c32afc8c881 (current diff)
parent 1181 9d05552239c2 (diff)
child 1191 0523013ddf00
merge commit
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Thu Apr 08 14:51:58 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Thu Apr 08 15:47:15 2010 -0500
@@ -267,7 +267,10 @@
 					// Get the parent base build platform 
 					String baseBuildPlatform = null; 
 					if (parentNode != null){ 
-						baseBuildPlatform = parentNode.getAttributes().getNamedItem("name").getNodeValue(); 
+						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
 					// out of.  They must have a platform and a target.