commit cad4596c2ffa6bf49d01e8f5522eec200d5ab527
author Yifan Hong <elsk@google.com> Mon Oct 28 18:35:27 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 28 18:35:27 2019 -0700
tree 79b783ebdd7127b6caa4a62823ff7ac7dcac7608
parent be0c47941e6842cd14d72dd0ee3f455123e20bf2
parent 5946473c360f347389563ec0c19c2f791747b718

Merge "Include system_other.img in super.img by default" am: 0fdd73b18f am: dd8414a5ae am: 8899c7ce3a
am: 5946473c36

Change-Id: I072ac32232f8e4f72e1f288d9e7888900c4f6893

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9c60855..6015796 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4815,6 +4815,8 @@
   $(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)
@@ -4824,6 +4826,12 @@
 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.