From fd358ae340416aca734f8cf6df245a9173e17b9f Mon Sep 17 00:00:00 2001 From: Juho Kim Date: Wed, 5 Apr 2023 07:10:21 +0000 Subject: [PATCH] Revert "Copy SBOM to dist directory when running "m dist"." This reverts commit bc7868b18e66db290baebdeff3e66701f97ba2d1. Reason for revert: DroidMonitor: Potential culprit for Bug 277015970 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Change-Id: If7d2d070714d5b58e77488d4e26d4003bfc34f79 --- core/main.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/core/main.mk b/core/main.mk index 7c0f92b978..514e7c4806 100644 --- a/core/main.mk +++ b/core/main.mk @@ -2193,7 +2193,6 @@ $(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)