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

Merge "Switch from VENDOR_BLOBS_NOTICE to VENDOR_BLOBS_LICENSE." am: 9651113f02

Browse Source 
am: 92b51b4e8d

Change-Id: Ia11cb699e35fe518167edfdeaa4198fe99880210
This commit is contained in:
Ian Kasprzak
2019-11-12 21:54:19 -08:00
committed by android-build-merger
parent c1d1c21fb1 92b51b4e8d
commit 387dcfc414
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/tasks/with-license.mk
View File

@@ -29,8 +29,8 @@ with_license_intermediates := \
license_image_input_zip := $(with_license_intermediates)/$(name).zip license_image_input_zip := $(with_license_intermediates)/$(name).zip
$(license_image_input_zip) : $(BUILT_TARGET_FILES_PACKAGE) $(ZIP2ZIP) $(license_image_input_zip) : $(BUILT_TARGET_FILES_PACKAGE) $(ZIP2ZIP)
# DO NOT PROCEED without a license file. # DO NOT PROCEED without a license file.
ifndef VENDOR_BLOBS_NOTICE ifndef VENDOR_BLOBS_LICENSE
@echo "with-license requires VENDOR_BLOBS_NOTICE to be set." @echo "with-license requires VENDOR_BLOBS_LICENSE to be set."
exit 1 exit 1
else else
$(ZIP2ZIP) -i $(BUILT_TARGET_FILES_PACKAGE) -o $@ \ $(ZIP2ZIP) -i $(BUILT_TARGET_FILES_PACKAGE) -o $@ \
@@ -41,11 +41,11 @@ endif
with_license_zip := $(PRODUCT_OUT)/$(name).sh with_license_zip := $(PRODUCT_OUT)/$(name).sh
$(with_license_zip): PRIVATE_NAME := $(name) $(with_license_zip): PRIVATE_NAME := $(name)
$(with_license_zip): PRIVATE_INPUT_ZIP := $(license_image_input_zip) $(with_license_zip): PRIVATE_INPUT_ZIP := $(license_image_input_zip)
$(with_license_zip): PRIVATE_VENDOR_BLOBS_NOTICE := $(VENDOR_BLOBS_NOTICE) $(with_license_zip): PRIVATE_VENDOR_BLOBS_LICENSE := $(VENDOR_BLOBS_LICENSE)
$(with_license_zip): $(license_image_input_zip) $(VENDOR_BLOBS_NOTICE) $(with_license_zip): $(license_image_input_zip) $(VENDOR_BLOBS_LICENSE)
$(with_license_zip): $(HOST_OUT_EXECUTABLES)/generate-self-extracting-archive $(with_license_zip): $(HOST_OUT_EXECUTABLES)/generate-self-extracting-archive
# Args: <output> <input archive> <comment> <license file> # Args: <output> <input archive> <comment> <license file>
$(HOST_OUT_EXECUTABLES)/generate-self-extracting-archive $@ \ $(HOST_OUT_EXECUTABLES)/generate-self-extracting-archive $@ \
$(PRIVATE_INPUT_ZIP) $(PRIVATE_NAME) $(PRIVATE_VENDOR_BLOBS_NOTICE) $(PRIVATE_INPUT_ZIP) $(PRIVATE_NAME) $(PRIVATE_VENDOR_BLOBS_LICENSE)
with-license : $(with_license_zip) with-license : $(with_license_zip)
$(call dist-for-goals, with-license, $(with_license_zip)) $(call dist-for-goals, with-license, $(with_license_zip))