--- old/modules/jdk.packager/src/main/native/library/common/LinuxPlatform.cpp 2016-11-10 23:00:41.000000000 +0300 +++ new/modules/jdk.packager/src/main/native/library/common/LinuxPlatform.cpp 2016-11-10 23:00:41.000000000 +0300 @@ -127,7 +127,6 @@ } TString LinuxPlatform::GetBundledJVMLibraryFileName(TString RuntimePath) { -#ifdef USE_JLI_LAUNCH TString result = FilePath::IncludeTrailingSeparater(RuntimePath) + "lib/"JAVAARCH"/jli/libjli.so"; @@ -135,25 +134,6 @@ 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; }