From ee09bada671f17da1ef60a9ce0b2bdb00c028f04 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 5 Mar 2021 00:17:33 +0000
Subject: [PATCH] 8262300: jpackage app-launcher fails on linux when using
 JDK11 based runtime

Reviewed-by: herrick, almatvee
---
 .../linux/native/libapplauncher/LinuxLauncherLib.cpp            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp b/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp
index f93bb7512e4..4f3cba6b91d 100644
--- a/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp
+++ b/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp
@@ -55,6 +55,8 @@ void launchApp() {
 
     AppLauncher appLauncher;
     appLauncher.addJvmLibName(_T("lib/libjli.so"));
+    // add backup - older version such as JDK11 have it in jli sub-dir
+    appLauncher.addJvmLibName(_T("lib/jli/libjli.so"));
 
     if (ownerPackage.name().empty()) {
         // Launcher should be in "bin" subdirectory of app image.