# HG changeset patch
# User timkelly
# Date 1264455304 21600
# Node ID 5711a1a81dc6aeb116769465695981765b99ae26
# Parent  91b08ebd274861727657186a065154537cc56de9
Fix bug 10488. Don't add platform_paths.hrh to S60 includes if it does not exist.

diff -r 91b08ebd2748 -r 5711a1a81dc6 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java	Mon Jan 25 10:34:54 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java	Mon Jan 25 15:35:04 2010 -0600
@@ -47,8 +47,10 @@
 	private static final String S60_MIDDWARE_INC = "epoc32/include/middleware";
 	
 	private static final String S60_MIDDWARE_INC2 =  "epoc32/include/mw";
-	private static final String S60_INC_MACROS2 = "#include <domain/osextensions/platform_paths.hrh>\nAPP_LAYER_SYSTEMINCLUDE";
-
+	private static final String S60_DOMAND_OSTEXT_PLAT_PATHS = "epoc32/include/domain/osextensions/platform_paths.hrh";
+	private static final String S60_DOMAND_OSTEXT_PLAT_PATHS_INCLUDE = "#include <domain/osextensions/platform_paths.hrh>";
+	private static final String APP_LAYER_SYSTEM_INCLUDES = "APP_LAYER_SYSTEMINCLUDE";
+	
 	private static final String S60_SF_FOLDER =  "sf";
 	private static final String S60_INC_MACROS_SF = "#include <platform_paths.hrh>\n#include <data_caging_paths.hrh>\nAPP_LAYER_SYSTEMINCLUDE";
 
@@ -188,7 +190,16 @@
 				
 				if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists()) {
 					// add symbol as at least one build config is a CustKit
-					S60_50_Macros_String = S60_INC_MACROS2;
+					File domainPath = new File(sdk.getEPOCROOT(), S60_DOMAND_OSTEXT_PLAT_PATHS);
+					if (domainPath.exists()){
+						S60_50_Macros_String = S60_DOMAND_OSTEXT_PLAT_PATHS_INCLUDE + "\n";
+					} 
+					//else {
+					//   The platform_paths include is in the variant.cfg defined prefix file	
+					//}
+					
+					S60_50_Macros_String += APP_LAYER_SYSTEM_INCLUDES;
+					
 					break;
 				}