diff options
Diffstat (limited to 'BaseTools/Source/Python')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Common/Misc.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 31721a6f9f..c174b5a0bb 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -3416,7 +3416,7 @@ class ModuleAutoGen(AutoGen): RetVal.append(PackageDir)
IncludesList = Package.Includes
if Package._PrivateIncludes:
- if not self.MetaFile.Path.startswith(PackageDir):
+ if not self.MetaFile.OriginalPath.Path.startswith(PackageDir):
IncludesList = list(set(Package.Includes).difference(set(Package._PrivateIncludes)))
for Inc in IncludesList:
if Inc not in RetVal:
diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 0e0cb45ebe..d082c58bef 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -281,6 +281,7 @@ def ProcessDuplicatedInf(Path, BaseName, Workspace): #
RtPath.Path = TempFullPath
RtPath.BaseName = BaseName
+ RtPath.OriginalPath = Path
#
# If file exists, compare contents
#
@@ -1405,6 +1406,7 @@ class PathClass(object): self.TagName = TagName
self.ToolCode = ToolCode
self.ToolChainFamily = ToolChainFamily
+ self.OriginalPath = self
## Convert the object of this class to a string
#
|