|
@@ -907,26 +907,26 @@ macro _PY_PROTO_CMD_INTERNAL(File) {
|
|
|
}
|
|
|
|
|
|
# tag:proto tag:java-specific
|
|
|
-JAVA_PROTO_RUNTIME=
|
|
|
+JAVA_PROTO_RUNTIME=
|
|
|
|
|
|
# tag:proto tag:java-specific
|
|
|
-### @usage: USE_JAVALITE()
|
|
|
-### Use protobuf-javalite for Java
|
|
|
+### @usage: USE_JAVALITE()
|
|
|
+### Use protobuf-javalite for Java
|
|
|
macro USE_JAVALITE() {
|
|
|
- SET(JAVA_PROTO_RUNTIME javalite)
|
|
|
+ SET(JAVA_PROTO_RUNTIME javalite)
|
|
|
}
|
|
|
|
|
|
# tag:proto tag:java-specific
|
|
|
JAVA_PROTO_RUNTIME_VERSION = 3.18.2
|
|
|
JAVA_PROTO_COMMON_VERSION = 1.12.0
|
|
|
-when ($JAVA_PROTO_RUNTIME == "javalite") {
|
|
|
- _JAVA_PROTO_OUT_ARG=--java_out=lite:
|
|
|
+when ($JAVA_PROTO_RUNTIME == "javalite") {
|
|
|
+ _JAVA_PROTO_OUT_ARG=--java_out=lite:
|
|
|
JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}
|
|
|
- JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.19.0
|
|
|
- JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.19.0
|
|
|
-}
|
|
|
+ JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.19.0
|
|
|
+ JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.19.0
|
|
|
+}
|
|
|
otherwise {
|
|
|
- _JAVA_PROTO_OUT_ARG=--java_out=
|
|
|
+ _JAVA_PROTO_OUT_ARG=--java_out=
|
|
|
JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}
|
|
|
JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.26.0
|
|
|
JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.26.0
|