summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-10-05 10:28:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-05 10:28:48 +0000
commita49558ef3e5cf7713dbb2718ffd1d6376c00494e (patch)
treee1a51ff5d9b6d8c074d763b37951e8d2854d3d0a
parent6508592e65ed402bc7260108d6d396923eea649d (diff)
parent8fc533282c7fe805da0f937a224d93bf35d95b11 (diff)
downloadjdk17-a49558ef3e5cf7713dbb2718ffd1d6376c00494e.tar.gz
Merge "Revert^2 "Update path for libjli.so"" am: e3849576b2 am: 9bb0c124d2 am: 58e3688a1a am: 8fc533282c
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk17/+/2239937 Change-Id: I7d5413d87c36f67a5937b35132ed7cb6042c35dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--linux-x86/bin/java_remote_toolchain_inputs2
-rw-r--r--linux-x86/bin/javac_remote_toolchain_inputs2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-x86/bin/java_remote_toolchain_inputs b/linux-x86/bin/java_remote_toolchain_inputs
index 0f23edb..7342962 100644
--- a/linux-x86/bin/java_remote_toolchain_inputs
+++ b/linux-x86/bin/java_remote_toolchain_inputs
@@ -1,4 +1,4 @@
-../lib/jli/libjli.so
+../lib/libjli.so
../lib/jvm.cfg
../lib/server/libjvm.so
../lib/libverify.so
diff --git a/linux-x86/bin/javac_remote_toolchain_inputs b/linux-x86/bin/javac_remote_toolchain_inputs
index 2c2a794..21657c3 100644
--- a/linux-x86/bin/javac_remote_toolchain_inputs
+++ b/linux-x86/bin/javac_remote_toolchain_inputs
@@ -1,4 +1,4 @@
-../lib/jli/libjli.so
+../lib/libjli.so
../lib/jvm.cfg
../lib/server/libjvm.so
../lib/libverify.so