Index: edk2-edk2-stable201905/OvmfPkg/OvmfPkgX64.fdf
===================================================================
--- edk2-edk2-stable201905.orig/OvmfPkg/OvmfPkgX64.fdf
+++ edk2-edk2-stable201905/OvmfPkg/OvmfPkgX64.fdf
@@ -291,7 +291,9 @@ INF  MdeModulePkg/Universal/Disk/UdfDxe/
 !if $(TOOL_CHAIN_TAG) != "XCODE5"
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif
+!ifndef $(EXCLUDE_SHELL)
 INF  ShellPkg/Application/Shell/Shell.inf
+!endif
 
 INF MdeModulePkg/Logo/LogoDxe.inf