From 8f9b3c196ce155f706294a7abae8d3e26815a439 Mon Sep 17 00:00:00 2001 From: Ian Kasprzak Date: Thu, 5 Dec 2019 15:29:40 -0800 Subject: [PATCH] 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 --- core/tasks/with-license.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/tasks/with-license.mk b/core/tasks/with-license.mk index daa68971b..469ad769c 100644 --- a/core/tasks/with-license.mk +++ b/core/tasks/with-license.mk @@ -20,7 +20,7 @@ ifeq ($(TARGET_BUILD_TYPE),debug) name := $(name)_debug endif -name := $(name)-img-$(FILE_NAME_TAG)-with-license +name := $(name)-flashable-$(FILE_NAME_TAG)-with-license with_license_intermediates := \ $(call intermediates-dir-for,PACKAGING,with_license) @@ -35,8 +35,7 @@ ifndef VENDOR_BLOBS_LICENSE else $(ZIP2ZIP) -i $(BUILT_TARGET_FILES_PACKAGE) -o $@ \ RADIO/bootloader.img:bootloader.img RADIO/radio.img:radio.img \ - IMAGES/system.img:system.img IMAGES/vendor.img:vendor.img \ - IMAGES/boot.img:boot.img OTA/android-info.txt:android-info.txt + IMAGES/*.img:. OTA/android-info.txt:android-info.txt endif with_license_zip := $(PRODUCT_OUT)/$(name).sh $(with_license_zip): PRIVATE_NAME := $(name)