openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Include all system images in -with-license.sh 

Rename artifact to not use -img- which conflicts w/ TF
test filters.

Bug: 125451157
Test: Verified phone flash works with new with-license artifact.
Change-Id: I7dd4eb17a24f1bf36926a83939f69681ff8b26ad
This commit is contained in:
Ian Kasprzak 2019-12-05 15:29:40 -08:00
parent d97822a5f7
commit 8f9b3c196c
1 changed files with 2 additions and 3 deletions
Show Stats 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)