core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContextDataCache.java
equal
deleted
inserted
replaced
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 |
190 |
191 File prefixFile = context.getPrefixFromVariantCfg().toFile(); |
191 File prefixFile = null; |
|
192 if (context.getPrefixFromVariantCfg() != null){ |
|
193 prefixFile = context.getPrefixFromVariantCfg().toFile(); |
|
194 } |
|
195 |
192 ISDKBuildInfo buildInfo = sdk.getBuildInfo(builderId); |
196 ISDKBuildInfo buildInfo = sdk.getBuildInfo(builderId); |
193 |
197 |
194 if (prefixFile == null){ |
198 if (prefixFile == null){ |
195 // Check that the prefix file may have become available since the SDK was scanned last. |
199 // Check that the prefix file may have become available since the SDK was scanned last. |
196 // 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. |
200 // 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. |