New config for yexport excludes

2 files changed, 20 insertions, 7 deletions

diff --git a/build/plugins/java.py b/build/plugins/java.py
index 8fc91f1d170..c4bf4fa4f8f 100644
--- a/build/plugins/java.py
+++ b/build/plugins/java.py
@@ -475,4 +475,5 @@ def on_setup_project_coords_if_needed(unit, *args):
         value = '\\"{}\\"'.format(_maven_coords_for_project(unit, project_dir).rstrip(':'))
     else:
         value = 'project(\\":{}\\")'.format(project_dir.replace('/', ':'))
-    unit.set(['_EXPORT_GRADLE_PROJECT_COORDS', value])
+    unit.set(['EXPORT_GRADLE_PROJECT_COORDS', value])
+    unit.set(['EXPORT_GRADLE_PROJECT_COORDS_GLOBAL', value])
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 8d4dd11ba7b..caf2eac064c 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -3538,7 +3538,7 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
     .ALIASES=SRCS=_SRCS_NO_GLOBAL
     .ALLOWED=EMBED_JAVA_VCS_INFO
     .RESTRICTED=EXTERNAL_JAR
-    .GLOBAL=MAVEN_EXPORT_COORDS
+    .GLOBAL=MAVEN_EXPORT_COORDS EXPORT_GRADLE_PROJECT_COORDS
 
     PEERDIR(build/platform/java/jdk)
     PEERDIR+=$JDK_RESOURCE_PEERDIR $EXTERNAL_JAVA_EXTRA_PEERDIR
@@ -3673,6 +3673,7 @@ module _JAR_BASE: _BARE_UNIT {
     .ALLOWED=EMBED_JAVA_VCS_INFO DEPENDENCY_MANAGEMENT EXCLUDE
     .DEFAULT_NAME_GENERATOR=TwoDirNames
     .RESTRICTED=WITH_JDK RESOURCE RESOURCE_FILES
+    .GLOBAL=EXPORT_GRADLE_PROJECT_COORDS
 
     PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__
 
@@ -3731,13 +3732,18 @@ macro LOCAL_SOURCES_JAR(File) {
     SET(LOCAL_SOURCES_JAR_PATH $File)
 }
 
-JAVA_CONTRIB_SEM=consumer_classpath $_EXPORT_GRADLE_PROJECT_COORDS ${hide:TARGET} ${hide:AUTO_INPUT} && IGNORED
+JAVA_CONTRIB_SEM= \
+    consumer_classpath $EXPORT_GRADLE_PROJECT_COORDS ${hide:TARGET} ${hide:AUTO_INPUT} && \
+    peers_closure $MANAGED_PEERS_CLOSURE && \
+    peers_closure_coords $EXPORT_GRADLE_PROJECT_COORDS_GLOBAL && \
+    IGNORED
+
 # tag:java-specific
 module JAVA_CONTRIB: _JAR_BASE {
     .CMD=FETCH_CONTRIB_JAR
     .SEM=JAVA_CONTRIB_SEM
     .FINAL_TARGET=yes
-    .GLOBAL=MAVEN_EXPORT_COORDS
+    .GLOBAL=MAVEN_EXPORT_COORDS EXPORT_GRADLE_PROJECT_COORDS
 
     when ($JAR_RESOURCE_ID) {
         FETCH_TARGET_JAR= && $_FETCH_CONTRIB($JAR_RESOURCE_ID ${BINDIR}/${MODULE_PREFIX}${REALPRJNAME}${MODULE_SUFFIX})
@@ -4000,7 +4006,11 @@ _GRADLE_EXPORT_PUBLISHING_SEM=
 PUBLISH_MAVEN_VERSION=no
 _DO_GRADLE_EXPORT_PUBLISHING_SEM= && publish True && publish_group $MAVEN_EXPORT_GOUP_ID && publish_version $PUBLISH_MAVEN_VERSION
 
-BUILD_JAR_SEM=jar $MODDIR $REALPRJNAME ${hide:TARGET} ${hide:AUTO_INPUT} && applied_excludes $APPLIED_EXCLUDES && consumer_classpath $_EXPORT_GRADLE_PROJECT_COORDS $_JAR_MAIN_SEM $_GRADLE_EXPORT_PUBLISHING_SEM
+BUILD_JAR_SEM= \
+    jar $MODDIR $REALPRJNAME ${hide:TARGET} ${hide:AUTO_INPUT} && \
+    applied_excludes $EXCLUDED_EXPORT_GRADLE_PROJECT_COORDS_GLOBAL ${hide:APPLIED_EXCLUDES} && \
+    excludes_rules $EXCLUDE_VALUE && \
+    consumer_classpath $EXPORT_GRADLE_PROJECT_COORDS $_JAR_MAIN_SEM $_GRADLE_EXPORT_PUBLISHING_SEM
 
 ### _EXPORT_GRADLE_TARGET_ATTR(NAME, VALUE...)
 ###
@@ -4010,7 +4020,9 @@ macro _EXPORT_GRADLE_TARGET_ATTR(NAME, VALUE...) {
     .SEM=${pre= && $NAME :VALUE}
 }
 
-BUILD_PROTO_JAR_SEM=jar_proto $MODDIR $REALPRJNAME ${hide:target} ${hide:AUTO_INPUT} && consumer_classpath $_EXPORT_GRADLE_PROJECT_COORDS $_EXPORT_GRADLE_TARGET_ATTR(proto_namespace $PROTO_NAMESPACE) $_EXPORT_GRADLE_TARGET_ATTR(proto_grpc ${ext=yes:_GRPC_ENABLED})
+BUILD_PROTO_JAR_SEM= \
+    jar_proto $MODDIR $REALPRJNAME ${hide:target} ${hide:AUTO_INPUT} && \
+    consumer_classpath $EXPORT_GRADLE_PROJECT_COORDS $_EXPORT_GRADLE_TARGET_ATTR(proto_namespace $PROTO_NAMESPACE) $_EXPORT_GRADLE_TARGET_ATTR(proto_grpc ${ext=yes:_GRPC_ENABLED})
 
 # tag:java-specific tag:internal
 ### @usage: JAR_LIBRARY() #internal
@@ -4023,7 +4035,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
     .FINAL_TARGET=yes
     .ALIASES=JAVA_SRCS=IDEA_JAR_SRCS ANNOTATION_PROCESSOR=JAR_ANNOTATION_PROCESSOR
     .RESTRICTED=EXTERNAL_JAR
-    .GLOBAL=MAVEN_EXPORT_COORDS
+    .GLOBAL=MAVEN_EXPORT_COORDS EXPORT_GRADLE_PROJECT_COORDS
     MODULE_SUFFIX=.jar
 
     PEERDIR(build/platform/java/jdk)