StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5 am: 3d396b837e

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

Change-Id: I075cfe61e2412cc0965a5b2b87b8f5f0eeaf77d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Juho Kim
2023-04-05 09:01:45 +00:00
committed by Automerger Merge Worker
parent 225a986e87 3d396b837e
commit 0c351860cd
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/main.mk
View File

@@ -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)