Skip to content

Commit 7439a2b

Browse files
committed
Send SBOM info from java contribs
commit_hash:77f74103d8eca0543d41759e98d533f277e6808c
1 parent 3721d5e commit 7439a2b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

build/conf/java.conf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ multimodule JAVA_CONTRIB_PROGRAM {
299299

300300
SET(MODULE_TYPE JAVA_PROGRAM)
301301
ENABLE(DISABLE_SCRIPTGEN)
302+
DISABLE(_NEED_SBOM_INFO)
302303
}
303304
module JAR_COMPILATION: JAVA_CONTRIB {
304305
.ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO
@@ -584,6 +585,7 @@ SRC_RESOURCE_ID=
584585
FETCH_SRCS_JAR=
585586
FETCH_TARGET_JAR=
586587
FETCH_CONTRIB_JAR=${hide:JAVA_FAKEID} && $FETCH_TARGET_JAR && $FETCH_SRCS_JAR
588+
GEN_JAR_SBOM_COMPONENT=
587589

588590
# tag:java-specific
589591
macro JAR_RESOURCE(Id) {
@@ -616,7 +618,7 @@ _JAVA_CONTRIB_SEM= \
616618

617619
# tag:java-specific
618620
module JAVA_CONTRIB: _JAR_BASE {
619-
.CMD=$FETCH_CONTRIB_JAR
621+
.CMD=$FETCH_CONTRIB_JAR && $GEN_JAR_SBOM_COMPONENT
620622
.PEERDIR_POLICY=as_include
621623
.SEM=_JAVA_CONTRIB_SEM
622624
.FINAL_TARGET=yes

0 commit comments

Comments
 (0)