diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2014-10-23 08:26:29 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2014-10-23 08:26:29 +0100 |
| commit | a015b3a8a08ddbeec8b536686d880248dc028e11 (patch) | |
| tree | c5c46507ef86ed735d995e23827db9dd5c06ac4d /EmulatorPkg | |
| parent | 3a194a21e2a9eb5a22d59cbd03f155753a039fce (diff) | |
| parent | f4affe6f42ba5ea4d50ca65253dafa9b278ea260 (diff) | |
Merge branch 'linaro-platform-juno' into integrationintegration/14.10integration
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Conflicts:
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
Diffstat (limited to 'EmulatorPkg')
| -rw-r--r-- | EmulatorPkg/EmulatorPkg.dsc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 926411d37..60eddddb7 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -393,7 +393,7 @@ ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
- PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf
+ PathLib|MdeModulePkg/Library/BasePathLib/BasePathLib.inf
# MemoryAllocationLib|EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf
# SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
# SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
|