commit ff8e18cf3e91403bdedf8fcca5b5a8a223f83e65
author Wei Li <weiwli@google.com> Mon Apr 10 18:07:01 2023 +0000
committer Wei Li <weiwli@google.com> Tue Apr 11 23:43:54 2023 +0000
tree e7d6467b62cdfbaebe573fea70e79f5477f7d284
parent b2be62551c7eb5253456864bbfcd15db823d0b6f

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

This reverts commit fd358ae340416aca734f8cf6df245a9173e17b9f.

Reason for revert: fixed the issues in aosp/2529028 and aosp/2524438.

Change-Id: Ieb4e6189a9357dafe81f15c72d5603166d9caa4d

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 9ddd990..a738dd9 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -2194,6 +2194,7 @@
 	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)