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

Merge "Include all system images in -with-license.sh" am: c99726bcf0

Browse Source 
am: 9633038e48

Change-Id: I9dc5634b91cf2a018846d4cc7c1e8d0c439641f8
This commit is contained in:
Ian Kasprzak
2019-12-06 09:25:03 -08:00
committed by android-build-merger
parent 9fff19978f 9633038e48
commit b836080120
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ ifeq ($(TARGET_BUILD_TYPE),debug)
name := $(name)_debug name := $(name)_debug
endif endif
name := $(name)-img-$(FILE_NAME_TAG)-with-license name := $(name)-flashable-$(FILE_NAME_TAG)-with-license
with_license_intermediates := \ with_license_intermediates := \
$(call intermediates-dir-for,PACKAGING,with_license) $(call intermediates-dir-for,PACKAGING,with_license)
@@ -35,8 +35,7 @@ ifndef VENDOR_BLOBS_LICENSE
else else
$(ZIP2ZIP) -i $(BUILT_TARGET_FILES_PACKAGE) -o $@ \ $(ZIP2ZIP) -i $(BUILT_TARGET_FILES_PACKAGE) -o $@ \
RADIO/bootloader.img:bootloader.img RADIO/radio.img:radio.img \ RADIO/bootloader.img:bootloader.img RADIO/radio.img:radio.img \
IMAGES/system.img:system.img IMAGES/vendor.img:vendor.img \ IMAGES/*.img:. OTA/android-info.txt:android-info.txt
IMAGES/boot.img:boot.img OTA/android-info.txt:android-info.txt
endif 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)