commit bc7868b18e66db290baebdeff3e66701f97ba2d1
author Wei Li <weiwli@google.com> Thu Mar 16 12:06:53 2023 -0700
committer Wei Li <weiwli@google.com> Tue Apr 04 00:56:52 2023 +0000
tree 822846941144e28b8dbc3f66c17e2858b6dbe1f5
parent 32789cd805f93cda361769431afc6502cd619d05

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

Bug: 266726655
Test: Run "m dist" and sbom.spdx.json should be in dist directory.
Test: CIs
Change-Id: Iabd3b980863fcb62dd75b6f778c49447073b9cdf

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 514e7c4..7c0f92b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -2193,6 +2193,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)