core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContextDataCache.java
equal
deleted
inserted
replaced
475 } |
475 } |
476 } |
476 } |
477 } |
477 } |
478 |
478 |
479 // also search files in same folder as variant.hrh |
479 // also search files in same folder as variant.hrh |
480 File prefix = context.getPrefixFromVariantCfg().toFile(); |
480 File prefix = null; |
|
481 if (context.getPrefixFromVariantCfg() != null){ |
|
482 prefix = context.getPrefixFromVariantCfg().toFile(); |
|
483 } |
481 if (sbvPlatform != null){ |
484 if (sbvPlatform != null){ |
482 // might be an alternate HRH file to use |
485 // might be an alternate HRH file to use |
483 IPath varVarHRH = sbvPlatform.getBuildVariantHRHFile(); |
486 IPath varVarHRH = sbvPlatform.getBuildVariantHRHFile(); |
484 if (!varVarHRH.toFile().equals(prefix) && varVarHRH.toFile().exists()){ |
487 if (!varVarHRH.toFile().equals(prefix) && varVarHRH.toFile().exists()){ |
485 prefix = varVarHRH.toFile(); |
488 prefix = varVarHRH.toFile(); |