StdLib: Move libraries from ShellPkg into MdeModulePkg and MdePkg.

The following libraries are being migrated out of ShellPkg in order to make
their functionality more widely available.
  • PathLib:        Incorporate into MdePkg/Library/BaseLib
  • FileHandleLib:  MdePkg/Library/UefiFileHandleLib
  • BaseSortLib:    MdeModulePkg/Library/BaseSortLib
  • UefiSortLib:    MdeModulePkg/Library/UefiSortLib

AppPkg.dsc:
StdLib.dsc:
StdLib.inc:
  Delete PathLib LibraryClass description.
  Update FileHandleLib LibraryClass description to reflect its new location.
  Update SortLib LibraryClass description to reflect its new location.

StdLib.inf:
  Delete PathLib from LibraryClasses.

realpath.c:
  Delete include of PathLib.h.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Daryl McDaniel <daryl.mcdaniel@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Lee Rosenbaum <lee.g.rosenbaum@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16608 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/AppPkg/AppPkg.dsc b/AppPkg/AppPkg.dsc
index 424434c0c8fda7bd672cb9902e8a7ee1c6e95d69..6db32a177d78cb324f3137ed610d0c99d62e750a 100644 (file)
--- a/AppPkg/AppPkg.dsc
+++ b/AppPkg/AppPkg.dsc
@@ -78,11 +78,10 @@
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf\r
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf\r
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
 \r
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
-  FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
-  SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf\r
-  PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf\r
 \r
   CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf\r
 \r

diff --git a/StdLib/LibC/StdLib/StdLib.inf b/StdLib/LibC/StdLib/StdLib.inf
index ce1c3052cbba68e9d5f0a89f86b4d7fd42a33b8c..ffc54b562e463d39ed3da6ee03cdf9f90f94cc77 100644 (file)
--- a/StdLib/LibC/StdLib/StdLib.inf
+++ b/StdLib/LibC/StdLib/StdLib.inf
@@ -55,7 +55,6 @@
   LibC\r
   LibCType\r
   LibSignal\r
-  PathLib\r
 \r
 ################################################################\r
 #\r

diff --git a/StdLib/LibC/StdLib/realpath.c b/StdLib/LibC/StdLib/realpath.c
index a7186184c97cda8a52db461e494818de5402a138..6d75f17a394dca93b0bf915320d2c79626ff138a 100644 (file)
--- a/StdLib/LibC/StdLib/realpath.c
+++ b/StdLib/LibC/StdLib/realpath.c
@@ -13,7 +13,6 @@
 #include <LibConfig.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
-#include <Library/PathLib.h>\r
 #include <errno.h>\r
 \r
 /** The realpath() function shall derive, from the pathname pointed to by\r

diff --git a/StdLib/StdLib.dsc b/StdLib/StdLib.dsc
index 43bd3e2cd7b2eaf8e78fe349d2ee6d96a48c1a49..c2842ce166db3d59cd348cd7a0072f35d9c33f48 100644 (file)
--- a/StdLib/StdLib.dsc
+++ b/StdLib/StdLib.dsc
@@ -77,14 +77,13 @@
   PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf\r
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf\r
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf\r
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf\r
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf\r
-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
-  FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
-  SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf\r
-  PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf\r
 \r
 ###################################################################################################\r
 #\r

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index 4c34905555ff3214c891233264a045e043147260..1b7fcf0bae31acf3f8a550f4e1fa17de53469b4d 100644 (file)
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -26,9 +26,8 @@
 \r
 [LibraryClasses.Common.UEFI_APPLICATION]\r
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
-  FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
-  SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf\r
-  PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf\r
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
 \r
   #\r