Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828 Change-Id: I03ef5e8432ad12cecc519dc4cba1dac57112fa45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
e7937f2c3b
1 changed files with 1 additions and 0 deletions
|
@ -2194,6 +2194,7 @@ $(PRODUCT_OUT)/sbom.spdx: $(PRODUCT_OUT)/sbom-metadata.csv $(GEN_SBOM)
|
|||
rm -rf $@
|
||||
$(GEN_SBOM) --output_file $@ --metadata $(PRODUCT_OUT)/sbom-metadata.csv --product_out_dir=$(PRODUCT_OUT) --build_version $(BUILD_FINGERPRINT_FROM_FILE) --product_mfr="$(PRODUCT_MANUFACTURER)" --json
|
||||
|
||||
$(call dist-for-goals,droid,$(PRODUCT_OUT)/sbom.spdx.json)
|
||||
else
|
||||
apps_only_sbom_files := $(sort $(patsubst %,%.spdx,$(apps_only_installed_files)))
|
||||
$(apps_only_sbom_files): $(PRODUCT_OUT)/sbom-metadata.csv $(GEN_SBOM)
|
||||
|
|
Loading…
Reference in a new issue