Merge "Revert "Copy SBOM to dist directory when running "m dist"."" (79e77ec4) · Commits · e / os / android_build

core/main.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)