diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-13 17:02:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-13 17:02:02 +0000 |
| commit | d7d9ddaafa4bbecef75ba91a26d311e702205245 (patch) | |
| tree | 1321aa5e636984c3dc4774ba6a2938fbdf48171e | |
| parent | 88d2497bd7fbc5b76083c69e2071036c23cc137b (diff) | |
| parent | e25fdd2fcb6c7035d76d521ab5ac1333f0ed11d8 (diff) | |
| download | build-d7d9ddaafa4bbecef75ba91a26d311e702205245.tar.gz | |
Merge "Include system_other.img in super.img by default" into android10-gsi
| -rw-r--r-- | core/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index cf062a2d28..6c00fae0b0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4507,6 +4507,8 @@ define build-superimage-target $(call dump-super-image-info,$(2)) $(foreach p,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \ echo "$(p)_image=$(INSTALLED_$(call to-upper,$(p))IMAGE_TARGET)" >> $(2);) + $(if $(BUILDING_SYSTEM_OTHER_IMAGE), $(if $(filter system,$(BOARD_SUPER_PARTITION_PARTITION_LIST)), \ + echo "system_other_image=$(INSTALLED_SYSTEMOTHERIMAGE_TARGET)" >> $(2);)) mkdir -p $(dir $(1)) PATH=$(dir $(LPMAKE)):$$PATH \ $(BUILD_SUPER_IMAGE) -v $(2) $(1) @@ -4516,6 +4518,12 @@ INSTALLED_SUPERIMAGE_TARGET := $(PRODUCT_OUT)/super.img INSTALLED_SUPERIMAGE_DEPENDENCIES := $(LPMAKE) $(BUILD_SUPER_IMAGE) \ $(foreach p, $(BOARD_SUPER_PARTITION_PARTITION_LIST), $(INSTALLED_$(call to-upper,$(p))IMAGE_TARGET)) +ifdef BUILDING_SYSTEM_OTHER_IMAGE +ifneq ($(filter system,$(BOARD_SUPER_PARTITION_PARTITION_LIST)),) +INSTALLED_SUPERIMAGE_DEPENDENCIES += $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) +endif +endif + # If BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT is set, super.img is built from images in the # $(PRODUCT_OUT) directory, and is built to $(PRODUCT_OUT)/super.img. Also, it will # be built for non-dist builds. This is useful for devices that uses super.img directly, e.g. |