Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b05968e1 authored by Wei Li's avatar Wei Li Committed by Automerger Merge Worker
Browse files

Merge "Copy SBOM files to directory dist/sbom instead of dist/." am:... 

Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4 am: 96fead86 am: f27ff5e6

Original change: https://android-review.googlesource.com/c/platform/build/+/2534191



Change-Id: I23fa0c10ae08c9b80e93aa051e8f960ffb24fe14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cf2a44e f27ff5e6

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -2194,7 +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)

$(call dist-for-goals,droid,$(PRODUCT_OUT)/sbom.spdx.json:sbom/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)