Commit cbeaa850 authored Apr 12, 2023 by Wei Li Committed by Automerger Merge Worker Apr 12, 2023

Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist"."""...

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

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

Change-Id: I3bbd10804b31aeccf1d1d386bb9c829d0b8cc27e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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)