From bc7868b18e66db290baebdeff3e66701f97ba2d1 Mon Sep 17 00:00:00 2001
From: Wei Li <weiwli@google.com>
Date: Thu, 16 Mar 2023 12:06:53 -0700
Subject: [PATCH] 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 | 1 +
 1 file changed, 1 insertion(+)

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