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

Commit 8f9b3c19 authored by Ian Kasprzak's avatar Ian Kasprzak
Browse files

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
parent d97822a5

core/tasks/with-license.mk

+2 −3
Original line number Original line Diff line number Diff line
@@ -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)