commit f63b7f9c6f83905d5b2a07c2d9842cf141610d6b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 19 00:34:20 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 19 00:34:20 2018 +0000
tree e3ffa717b17839b5020d5f45b4cea3312d9bb73a
parent e20c6588cec3f1a5d07c93e383a1e0b36321d8f4
parent 8916a2a13c5b2efdff3dff5bdd687f73be5901b7

Merge "Don't pass --setup_as_rootfs_from_kernel when using a super partition."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 79934aa..23dc59a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2767,8 +2767,10 @@
 # - not-chained: The --include_descriptors_from_image option for make_vbmeta_image
 #   will include the kernel cmdline descriptor from system.img into vbmeta.img
 ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
+ifeq ($(filter system, $(BOARD_SUPER_PARTITION_PARTITION_LIST)),)
 BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += --setup_as_rootfs_from_kernel
 endif
+endif
 
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --padding_size 4096
 BOARD_AVB_MAKE_VBMETA_MAINLINE_IMAGE_ARGS += --padding_size 4096