diff options
| -rw-r--r-- | build/conf/java.conf | 10 | ||||
| -rw-r--r-- | build/conf/proto.conf | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index d80c5bc29cd..ad4f5f1a29f 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -299,6 +299,8 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT { .RESTRICTED=EXTERNAL_JAR .GLOBAL=MAVEN_EXPORT_COORDS + SET(MODULE_TAG JAVA) + PEERDIR(build/platform/java/jdk) PEERDIR+=$JDK_RESOURCE_PEERDIR $EXTERNAL_JAVA_EXTRA_PEERDIR when ($KOTLIN_PROTO == "yes") { @@ -316,7 +318,7 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT { MAVEN_EXPORT_COORDS_GLOBAL=$MAVEN_EXPORT_GROUP_ID:${MODULE_PREFIX}${REALPRJNAME}:${MAVEN_EXPORT_VERSION}: } - PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL PACKAGE_UNION + PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_FBS JAVA_IDL PACKAGE_UNION HAS_MANAGEABLE_PEERS=yes DYNAMIC_LINK=yes _PROTO_CMDLINE=$_JAVA_PROTO_CMDLINE @@ -482,7 +484,9 @@ module _JAR_BASE: _BARE_UNIT { .DEFAULT_NAME_GENERATOR=TwoDirNames .RESTRICTED=WITH_JDK RESOURCE RESOURCE_FILES - PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__ RESOURCE_LIB + SET(MODULE_TAG JAVA) + + PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__ RESOURCE_LIB HAS_MANAGEABLE_PEERS=yes DYNAMIC_LINK=yes @@ -1988,7 +1992,7 @@ module JSRC_LIBRARY: _BARE_UNIT { .PEERDIR_POLICY=as_include .FINAL_TARGET=no .ALIASES=SRCS=FILES - PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL + PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_FBS JAVA_IDL MODULE_TYPE=LIBRARY SET(MODULE_SUFFIX .jsrc) SET(DONT_RESOLVE_INCLUDES yes) diff --git a/build/conf/proto.conf b/build/conf/proto.conf index c30b195e884..d68ec651d39 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -699,7 +699,7 @@ multimodule PROTO_LIBRARY { .EXTS=.jsrc .ALLOWED=GRPC .SEM=JAVA_PROTO_LIBRARY_SEM - SET(PEERDIR_TAGS JAVA_PROTO) + SET(PEERDIR_TAGS JAVA JAVA_PROTO) ENABLE(JAVA_PROTO) DISABLE(_NEED_SBOM_INFO) PEERDIR+=$JAVA_PROTOBUF_PEERS |