From 7edd0540e06444313647acd133c230785ddaf8ee Mon Sep 17 00:00:00 2001 From: Tom Rodriguez Date: Tue, 6 Jun 2023 15:53:54 +0000 Subject: [PATCH] 8309501: Remove workaround in bin/idea.sh for non standard JVMCI file layout Reviewed-by: dnsimon, erikj --- bin/idea.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/bin/idea.sh b/bin/idea.sh index 3f64f789dec..c85ae294454 100644 --- a/bin/idea.sh +++ b/bin/idea.sh @@ -193,17 +193,7 @@ for root in $MODULE_ROOTS; do root=`wslpath -am $root` fi - VM_CI="jdk.internal.vm.ci/share/classes" - VM_COMPILER="src/jdk.internal.vm.compiler/share/classes" - if test "${root#*$VM_CI}" != "$root" || test "${root#*$VM_COMPILER}" != "$root"; then - for subdir in "$root"/*; do - if [ -d "$subdir" ]; then - SOURCES=$SOURCES" $SOURCE_PREFIX""$subdir"/src"$SOURCE_POSTFIX" - fi - done - else - SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX" - fi + SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX" done add_replacement "###SOURCE_ROOTS###" "$SOURCES" @@ -274,4 +264,4 @@ $BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC if [ "x$WSL_DISTRO_NAME" != "x" ]; then rm -rf $ANT_TEMP -fi \ No newline at end of file +fi