|
@@ -903,11 +903,6 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
|
|
|
JAVAC_CMD=$ERROR_PRONE_JAVAC_CMD
|
|
|
}
|
|
|
|
|
|
- when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "16") {
|
|
|
- JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS
|
|
|
- JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS
|
|
|
- }
|
|
|
-
|
|
|
when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "17") {
|
|
|
JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS
|
|
|
JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS
|
|
@@ -1073,9 +1068,6 @@ elsewhen ($JDK_VERSION == "18") {
|
|
|
elsewhen ($JDK_VERSION == "17") {
|
|
|
JDK_REAL_VERSION=17
|
|
|
}
|
|
|
-elsewhen ($JDK_VERSION == "16") {
|
|
|
- JDK_REAL_VERSION=16
|
|
|
-}
|
|
|
elsewhen ($JDK_VERSION == "15") {
|
|
|
JDK_REAL_VERSION=15
|
|
|
}
|
|
@@ -1111,9 +1103,6 @@ otherwise {
|
|
|
# need jdk11 for spare parts in "host" platform
|
|
|
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
|
|
|
}
|
|
|
- when ($JDK_REAL_VERSION == "16") {
|
|
|
- JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk16 build/platform/java/jdk/jdk17
|
|
|
- }
|
|
|
when ($JDK_REAL_VERSION == "15") {
|
|
|
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk17
|
|
|
}
|
|
@@ -1138,9 +1127,6 @@ when ($JDK_REAL_VERSION == "18") {
|
|
|
when ($JDK_REAL_VERSION == "17") {
|
|
|
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
|
|
|
}
|
|
|
-when ($JDK_REAL_VERSION == "16") {
|
|
|
- UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar16
|
|
|
-}
|
|
|
when ($JDK_REAL_VERSION == "15") {
|
|
|
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar15
|
|
|
}
|
|
@@ -1169,9 +1155,6 @@ otherwise {
|
|
|
when ($JDK_REAL_VERSION == "17") {
|
|
|
JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
|
|
|
}
|
|
|
- when ($JDK_REAL_VERSION == "16") {
|
|
|
- JDK_RESOURCE=$JDK16_RESOURCE_GLOBAL
|
|
|
- }
|
|
|
when ($JDK_REAL_VERSION == "15") {
|
|
|
JDK_RESOURCE=$JDK15_RESOURCE_GLOBAL
|
|
|
}
|
|
@@ -1191,7 +1174,7 @@ when (!$USE_SYSTEM_ERROR_PRONE) {
|
|
|
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.3.1
|
|
|
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_3_1_RESOURCE_GLOBAL
|
|
|
}
|
|
|
- elsewhen ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15" || $JDK_REAL_VERSION == "16") {
|
|
|
+ elsewhen ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
|
|
|
ERROR_PRONE_VERSION=2.7.1
|
|
|
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.7.1
|
|
|
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_7_1_RESOURCE_GLOBAL
|
|
@@ -1245,9 +1228,6 @@ otherwise {
|
|
|
when ($JDK_REAL_VERSION == "17") {
|
|
|
UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
|
|
|
}
|
|
|
- when ($JDK_REAL_VERSION == "16") {
|
|
|
- UBERJAR_RESOURCE=$UBERJAR16_RESOURCE_GLOBAL
|
|
|
- }
|
|
|
when ($JDK_REAL_VERSION == "15") {
|
|
|
UBERJAR_RESOURCE=$UBERJAR15_RESOURCE_GLOBAL
|
|
|
}
|
|
@@ -1272,9 +1252,6 @@ when ($JDK_REAL_VERSION == "18") {
|
|
|
when ($JDK_REAL_VERSION == "17") {
|
|
|
WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
|
|
|
}
|
|
|
-when ($JDK_REAL_VERSION == "16") {
|
|
|
- WITH_JDK_RESOURCE=$WITH_JDK16_RESOURCE_GLOBAL
|
|
|
-}
|
|
|
when ($JDK_REAL_VERSION == "15") {
|
|
|
WITH_JDK_RESOURCE=$WITH_JDK15_RESOURCE_GLOBAL
|
|
|
}
|