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

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

Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e8 

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



Change-Id: I03ef5e8432ad12cecc519dc4cba1dac57112fa45
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 651e2a94 2e8993e8

core/main.mk

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