From ff8e18cf3e91403bdedf8fcca5b5a8a223f83e65 Mon Sep 17 00:00:00 2001
From: Wei Li <weiwli@google.com>
Date: Mon, 10 Apr 2023 18:07:01 +0000
Subject: [PATCH] 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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/main.mk b/core/main.mk
index 9ddd990b34..a738dd9754 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -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)