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

*** 125,161 ****
  
      return result;
  }
  
  TString LinuxPlatform::GetBundledJVMLibraryFileName(TString RuntimePath) {
- #ifdef USE_JLI_LAUNCH
      TString result = FilePath::IncludeTrailingSeparater(RuntimePath) +
          "lib/"JAVAARCH"/jli/libjli.so";
  
      if (FilePath::FileExists(result) == false) {
          result = FilePath::IncludeTrailingSeparater(RuntimePath) +
              "lib/"JAVAARCH"/jli/libjli.so";
      }
- #else
-     TString result = FilePath::IncludeTrailingSeparater(RuntimePath) +
-         "jre/lib/"JAVAARCH"/client/libjvm.so";
- 
-     if (FilePath::FileExists(result) == false) {
-         result = FilePath::IncludeTrailingSeparater(RuntimePath) +
-             "jre/lib/"JAVAARCH"/server/libjvm.so";
-     }
- 
-     if (FilePath::FileExists(result) == false) {
-         result = FilePath::IncludeTrailingSeparater(RuntimePath) +
-             "lib/"JAVAARCH"/server/libjvm.so";
-     }
- 
-     if (FilePath::FileExists(result) == false) {
-         result = FilePath::IncludeTrailingSeparater(RuntimePath) +
-             "lib/"JAVAARCH"/server/libjvm.so";
-     }
- #endif
  
      return result;
  }
  
  TString LinuxPlatform::GetSystemJRE() {
--- 125,141 ----