Build non-sparse super image if necessary.
If TARGET_USERIMAGES_SPARSE_EXT_DISABLED is set, don't provide
--sparse to lpmake, so that a non-sparse super image is built.
Test: build with the flag set.
Fixes: 120041578
Change-Id: I5a26e4c793b0e2ddc89e9c38c8828ac21044e78a
diff --git a/core/Makefile b/core/Makefile
index 97bbebe..89d5ef6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3745,6 +3745,8 @@
echo "super_$(group)_group_size=$(BOARD_$(call to-upper,$(group))_SIZE)" >> $(1); \
$(if $(BOARD_$(call to-upper,$(group))_PARTITION_LIST), \
echo "super_$(group)_partition_list=$(BOARD_$(call to-upper,$(group))_PARTITION_LIST)" >> $(1);))
+ $(if $(filter true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED)), \
+ echo "build_non_sparse_super_partition=true" >> $(1))
endef
# Depending on the various images guarantees that the underlying
diff --git a/tools/releasetools/build_super_image.py b/tools/releasetools/build_super_image.py
index 38ea3d6..0105960 100755
--- a/tools/releasetools/build_super_image.py
+++ b/tools/releasetools/build_super_image.py
@@ -135,7 +135,7 @@
cmd += GetArgumentsForImage(partition + "_b", group + "_b", other_image)
- if has_image:
+ if info_dict.get("build_non_sparse_super_partition") != "true":
cmd.append("--sparse")
cmd += ["--output", output]