aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsvidyuk <svidyuk@yandex-team.com>2023-10-05 14:31:55 +0300
committersvidyuk <svidyuk@yandex-team.com>2023-10-05 15:20:11 +0300
commite5ae5aad434c0a6d577a8437c394beed4b159d3f (patch)
tree007bd5f5a3aa420dd630130d446c5884d5dc1553
parentfff5409dfd0a109b15d8b57824bf85669de30195 (diff)
downloadydb-e5ae5aad434c0a6d577a8437c394beed4b159d3f.tar.gz
Use host JDK rather than target for GRPC Kotlin plugin
-rw-r--r--build/conf/proto.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index aa9f61aac9a..1c2961e6261 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -173,7 +173,7 @@ macro _ADD_SEM_PROP_IF_NON_EMPTY(Prop, Args...) {
macro WITH_KOTLIN_GRPC() {
ENABLE(KOTLIN_PROTO)
PEERDIR(build/platform/java/kotlin_grpc)
- SET_APPEND(JAVA_PROTO_ARGS ${env:"JAVA_HOME=${WITH_JDK_RESOURCE_GLOBAL}"} ${env:"KOTLIN_GRPC_JAR=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/protoc-gen-grpc-kotlin-1.3.1.jar"} --plugin=protoc-gen-kotlin_grpc=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/grpc_kotlin --kotlin_grpc_out=$ARCADIA_BUILD_ROOT/java_out)
+ SET_APPEND(JAVA_PROTO_ARGS ${env:"JAVA_HOME=${JDK_RESOURCE}"} ${env:"KOTLIN_GRPC_JAR=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/protoc-gen-grpc-kotlin-1.3.1.jar"} --plugin=protoc-gen-kotlin_grpc=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/grpc_kotlin --kotlin_grpc_out=$ARCADIA_BUILD_ROOT/java_out)
SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/io/grpc/grpc-kotlin-stub/1.3.1)
SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/com/google/protobuf/protobuf-kotlin/3.24.2)
}