Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd358ae3 authored by Juho Kim's avatar Juho Kim Committed by Gerrit Code Review
Browse files

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

This reverts commit bc7868b1.

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
parent bc7868b1

core/main.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -2193,7 +2193,6 @@ $(PRODUCT_OUT)/sbom.spdx: $(PRODUCT_OUT)/sbom-metadata.csv $(GEN_SBOM) 
	rm -rf $@

	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

	$(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

else

apps_only_sbom_files := $(sort $(patsubst %,%.spdx,$(apps_only_installed_files)))

apps_only_sbom_files := $(sort $(patsubst %,%.spdx,$(apps_only_installed_files)))

$(apps_only_sbom_files): $(PRODUCT_OUT)/sbom-metadata.csv $(GEN_SBOM)

$(apps_only_sbom_files): $(PRODUCT_OUT)/sbom-metadata.csv $(GEN_SBOM)