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

Commit 8a59680b authored by Howard Chen's avatar Howard Chen Committed by Automerger Merge Worker
Browse files

Merge "Make GSI target to export bootimage to DIST" am: c1b9c1d8 

Original change: https://android-review.googlesource.com/c/platform/build/+/1839815

Change-Id: Ibac747f40c9a961fbe692f511b2edfef11f07247
parents 651b8b7e c1b9c1d8

core/main.mk

+4 −0
Original line number Diff line number Diff line
@@ -1589,6 +1589,10 @@ superimage_empty: $(INSTALLED_SUPERIMAGE_EMPTY_TARGET) 
.PHONY: bootimage

bootimage: $(INSTALLED_BOOTIMAGE_TARGET)



ifeq (true,$(PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST))

$(call dist-for-goals, bootimage, $(INSTALLED_BOOTIMAGE_TARGET))

endif



.PHONY: bootimage_debug

bootimage_debug: $(INSTALLED_DEBUG_BOOTIMAGE_TARGET)

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ _product_single_value_vars += PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS 


# Boot image options.

_product_single_value_vars += \

    PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST \

    PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE \

    PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION \

    PRODUCT_USES_DEFAULT_ART_CONFIG \

target/product/gsi_release.mk

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ PRODUCT_BUILD_USERDATA_IMAGE := false 
PRODUCT_BUILD_VENDOR_IMAGE := false

PRODUCT_BUILD_SUPER_PARTITION := false

PRODUCT_BUILD_SUPER_EMPTY_IMAGE := false

PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST := true



# Always build modules from source

MODULE_BUILD_FROM_SOURCE := true