core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContextDataCache.java
equal
deleted
inserted
replaced
185 |
185 |
186 synchronized (this) { |
186 synchronized (this) { |
187 |
187 |
188 List<IDefine> macros = new ArrayList<IDefine>(); |
188 List<IDefine> macros = new ArrayList<IDefine>(); |
189 Map<String, IDefine> namedMacros = new HashMap<String, IDefine>(); |
189 Map<String, IDefine> namedMacros = new HashMap<String, IDefine>(); |
190 File prefixFile = sdk.getPrefixFile(builderId); |
190 |
|
191 ISDKBuildInfo sdkBuildInfo = sdk.getBuildInfo(builderId); |
|
192 File prefixFile = sdkBuildInfo.getPrefixFromVariantCfg().toFile(); |
191 ISDKBuildInfo buildInfo = sdk.getBuildInfo(builderId); |
193 ISDKBuildInfo buildInfo = sdk.getBuildInfo(builderId); |
192 |
194 |
193 if (prefixFile == null){ |
195 if (prefixFile == null){ |
194 // Check that the prefix file may have become available since the SDK was scanned last. |
196 // Check that the prefix file may have become available since the SDK was scanned last. |
195 // This can happen, for e.g., if the user opens the IDE _then_ does a subst on a drive that already has an SDK entry. |
197 // This can happen, for e.g., if the user opens the IDE _then_ does a subst on a drive that already has an SDK entry. |
472 } |
474 } |
473 } |
475 } |
474 } |
476 } |
475 |
477 |
476 // also search files in same folder as variant.hrh |
478 // also search files in same folder as variant.hrh |
477 File prefix = sdk.getPrefixFile(builderId); |
479 ISDKBuildInfo sdkBuildInfo = sdk.getBuildInfo(builderId); |
|
480 File prefix = sdkBuildInfo.getPrefixFromVariantCfg().toFile(); |
478 if (sbvPlatform != null){ |
481 if (sbvPlatform != null){ |
479 // might be an alternate HRH file to use |
482 // might be an alternate HRH file to use |
480 IPath varVarHRH = sbvPlatform.getBuildVariantHRHFile(); |
483 IPath varVarHRH = sbvPlatform.getBuildVariantHRHFile(); |
481 if (!varVarHRH.toFile().equals(prefix) && varVarHRH.toFile().exists()){ |
484 if (!varVarHRH.toFile().equals(prefix) && varVarHRH.toFile().exists()){ |
482 prefix = varVarHRH.toFile(); |
485 prefix = varVarHRH.toFile(); |