modules/jdk.packager/src/main/native/library/common/WindowsPlatform.cpp

@@ -252,37 +252,17 @@
 //    appname = FilePath::ExtractFileName(appname);
 //    return ShowResponseMessage(appname, description);
 //}
 
 TString WindowsPlatform::GetBundledJVMLibraryFileName(TString RuntimePath) {
-#ifdef USE_JLI_LAUNCH
     TString result = FilePath::IncludeTrailingSeparater(RuntimePath) +
         _T("jre\\bin\\jli.dll");
 
     if (FilePath::FileExists(result) == false) {
         result = FilePath::IncludeTrailingSeparater(RuntimePath) +
             _T("bin\\jli.dll");
     }
-#else
-    TString result = FilePath::IncludeTrailingSeparater(RuntimePath) +
-        _T("jre\\bin\\client\\jvm.dll");
-
-    if (FilePath::FileExists(result) == false) {
-        result = FilePath::IncludeTrailingSeparater(RuntimePath) +
-            _T("jre\\bin\\server\\jvm.dll");
-    }
-
-    if (FilePath::FileExists(result) == false) {
-        result = FilePath::IncludeTrailingSeparater(RuntimePath) +
-            _T("bin\\client\\jvm.dll");
-    }
-
-    if (FilePath::FileExists(result) == false) {
-        result = FilePath::IncludeTrailingSeparater(RuntimePath) +
-            _T("bin\\server\\jvm.dll");
-    }
-#endif
 
     return result;
 }
 
 TString WindowsPlatform::GetSystemJVMLibraryFileName() {