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

Commit 3d396b83 authored by Juho Kim's avatar Juho Kim Committed by Automerger Merge Worker
Browse files

Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4 

Original change: https://android-review.googlesource.com/c/platform/build/+/2524655



Change-Id: I65f143ea09fadea705973a639be296e39600d374
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 374d334d 79e77ec4

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)