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

Commit ff8e18cf authored by Wei Li's avatar Wei Li
Browse files

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

This reverts commit fd358ae3.

Reason for revert: fixed the issues in aosp/2529028 and aosp/2524438.

Change-Id: Ieb4e6189a9357dafe81f15c72d5603166d9caa4d
parent b2be6255

core/main.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -2194,6 +2194,7 @@ $(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)