diff -r 47f0d21c7e8d -r 12c965587689 src/jdk.jpackage/share/native/libapplauncher/Macros.cpp
--- a/src/jdk.jpackage/share/native/libapplauncher/Macros.cpp	Fri Oct 04 18:13:05 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Macros.cpp	Wed Oct 09 10:58:20 2019 -0400
@@ -39,21 +39,9 @@
     Macros& macros = Macros::GetInstance();
 
     // Public macros.
-    macros.AddMacro(_T("$APPDIR"), package.GetPackageRootDirectory());
-    macros.AddMacro(_T("$PACKAGEDIR"), package.GetPackageAppDirectory());
-    macros.AddMacro(_T("$LAUNCHERDIR"), package.GetPackageLauncherDirectory());
-    macros.AddMacro(_T("$APPDATADIR"), package.GetAppDataDirectory());
-
-    TString javaHome =
-            FilePath::ExtractFilePath(package.GetJavaLibraryFileName());
-    macros.AddMacro(_T("$JREHOME"), javaHome);
-
-    // App CDS Macros
-    macros.AddMacro(_T("$CACHEDIR"), package.GetAppCDSCacheDirectory());
-
-    // Private macros.
-    TString javaVMLibraryName = FilePath::ExtractFileName(javaHome);
-    macros.AddMacro(_T("$JAVAVMLIBRARYNAME"), javaVMLibraryName);
+    macros.AddMacro(_T("$ROOTDIR"), package.GetPackageRootDirectory());
+    macros.AddMacro(_T("$APPDIR"), package.GetPackageAppDirectory());
+    macros.AddMacro(_T("$BINDIR"), package.GetPackageLauncherDirectory());
 }
 
 Macros& Macros::GetInstance() {