resolve merge conflicts of c36ab42 to nyc-mr1-dev-plus-aosp

Change-Id: Iaf78fb6c723955fd92cc64194cb32bba73a9dafb

diff --cc core/Makefile
index 5067e1c,7a1041a..de4edc8
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -1527,66 -1501,64 +1515,120 @@@ $(INSTALLED_CACHEIMAGE_TARGET): $(INTER
  cacheimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)
        $(build-cacheimage-target)
  
 +else # BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE
 +# we need to ignore the broken cache link when doing the rsync
 +IGNORE_CACHE_LINK := --exclude=cache
  endif # BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE
  
+ # -----------------------------------------------------------------
+ # vbmeta image
+ ifeq ($(BOARD_AVB_ENABLE),true)
+ 
+ BUILT_VBMETAIMAGE_TARGET := $(PRODUCT_OUT)/vbmeta.img
+ 
+ INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS := \
+     --include_descriptors_from_image $(INSTALLED_BOOTIMAGE_TARGET) \
+     --include_descriptors_from_image $(INSTALLED_SYSTEMIMAGE) \
+     --generate_dm_verity_cmdline_from_hashtree $(INSTALLED_SYSTEMIMAGE)
+ 
+ ifdef BOARD_AVB_ROLLBACK_INDEX
+ INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += --rollback_index $(BOARD_AVB_ROLLBACK_INDEX)
+ endif
+ 
+ ifndef BOARD_AVB_KEY_PATH
+ # If key path isn't specified, use the 4096-bit test key.
+ INTERNAL_AVB_SIGNING_ARGS := \
+     --algorithm SHA256_RSA4096 \
+     --key external/avb/test/data/testkey_rsa4096.pem
+ else
+ INTERNAL_AVB_SIGNING_ARGS := \
+     --algorithm $(BOARD_AVB_ALGORITHM) --key $(BOARD_AVB_KEY_PATH)
+ endif
+ 
+ ifndef BOARD_BOOTIMAGE_PARTITION_SIZE
+   $(error BOARD_BOOTIMAGE_PARTITION_SIZE must be set for BOARD_AVB_ENABLE)
+ endif
+ 
+ ifndef BOARD_SYSTEMIMAGE_PARTITION_SIZE
+   $(error BOARD_SYSTEMIMAGE_PARTITION_SIZE must be set for BOARD_AVB_ENABLE)
+ endif
+ 
+ define build-vbmetaimage-target
+   $(call pretty,"Target vbmeta image: $(INSTALLED_VBMETAIMAGE_TARGET)")
+   $(hide) $(AVBTOOL) make_vbmeta_image \
+     $(INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS) \
+     $(INTERNAL_AVB_SIGNING_ARGS) \
+     $(BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS) \
+     --output $@
+ endef
+ 
+ INSTALLED_VBMETAIMAGE_TARGET := $(BUILT_VBMETAIMAGE_TARGET)
+ $(INSTALLED_VBMETAIMAGE_TARGET): $(AVBTOOL) $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_SYSTEMIMAGE)
+       $(build-vbmetaimage-target)
+ 
+ .PHONY: vbmetaimage-nodeps
+ vbmetaimage-nodeps:
+       $(build-vbmetaimage-target)
+ 
+ # We need $(AVBTOOL) for system.img generation.
+ FULL_SYSTEMIMAGE_DEPS += $(AVBTOOL)
+ 
+ endif # BOARD_AVB_ENABLE
  
  # -----------------------------------------------------------------
 +# system_other partition image
 +ifeq ($(BOARD_USES_SYSTEM_OTHER_ODEX),true)
 +BOARD_USES_SYSTEM_OTHER := true
 +
 +# Marker file to identify that odex files are installed
 +INSTALLED_SYSTEM_OTHER_ODEX_MARKER := $(TARGET_OUT_SYSTEM_OTHER)/system-other-odex-marker
 +ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_SYSTEM_OTHER_ODEX_MARKER)
 +$(INSTALLED_SYSTEM_OTHER_ODEX_MARKER):
 +      $(hide) touch $@
 +endif
 +
 +ifdef BOARD_USES_SYSTEM_OTHER
 +INTERNAL_SYSTEMOTHERIMAGE_FILES := \
 +    $(filter $(TARGET_OUT_SYSTEM_OTHER)/%,\
 +      $(ALL_DEFAULT_INSTALLED_MODULES)\
 +      $(ALL_PDK_FUSION_FILES))
 +
 +INSTALLED_FILES_FILE_SYSTEMOTHER := $(PRODUCT_OUT)/installed-files-system-other.txt
 +$(INSTALLED_FILES_FILE_SYSTEMOTHER) : $(INTERNAL_SYSTEMOTHERIMAGE_FILES)
 +      @echo Installed file list: $@
 +      @mkdir -p $(dir $@)
 +      @rm -f $@
 +      $(hide) build/tools/fileslist.py $(TARGET_OUT_SYSTEM_OTHER) > $@
 +
 +systemotherimage_intermediates := \
 +    $(call intermediates-dir-for,PACKAGING,system_other)
 +BUILT_SYSTEMOTHERIMAGE_TARGET := $(PRODUCT_OUT)/system_other.img
 +
 +# Note that we assert the size is SYSTEMIMAGE_PARTITION_SIZE since this is the 'b' system image.
 +define build-systemotherimage-target
 +  $(call pretty,"Target system_other fs image: $(INSTALLED_SYSTEMOTHERIMAGE_TARGET)")
 +  @mkdir -p $(TARGET_OUT_SYSTEM_OTHER)
 +  @mkdir -p $(systemotherimage_intermediates) && rm -rf $(systemotherimage_intermediates)/system_other_image_info.txt
 +  $(call generate-userimage-prop-dictionary, $(systemotherimage_intermediates)/system_other_image_info.txt, skip_fsck=true)
 +  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \
 +      ./build/tools/releasetools/build_image.py \
 +      $(TARGET_OUT_SYSTEM_OTHER) $(systemotherimage_intermediates)/system_other_image_info.txt $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) $(TARGET_OUT)
 +  $(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMOTHERIMAGE_TARGET),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
 +endef
 +
 +# We just build this directly to the install location.
 +INSTALLED_SYSTEMOTHERIMAGE_TARGET := $(BUILT_SYSTEMOTHERIMAGE_TARGET)
 +$(INSTALLED_SYSTEMOTHERIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_SYSTEMOTHERIMAGE_FILES) $(INSTALLED_FILES_FILE_SYSTEMOTHER)
 +      $(build-systemotherimage-target)
 +
 +.PHONY: systemotherimage-nodeps
 +systemotherimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)
 +      $(build-systemotherimage-target)
 +
 +endif # BOARD_USES_SYSTEM_OTHER
 +
 +
 +# -----------------------------------------------------------------
  # vendor partition image
  ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE
  INTERNAL_VENDORIMAGE_FILES := \

diff --cc core/main.mk
Simple merge

diff --cc tools/releasetools/add_img_to_target_files.py
index 2363f6e,8c5dbcf..00904ae
--- 1/tools/releasetools/add_img_to_target_files.py
--- 2/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@@ -435,22 -407,9 +443,13 @@@ def AddImagesToTargetFiles(filename)
    banner("system")
    system_img_path = AddSystem(
      output_zip, recovery_img=recovery_image, boot_img=boot_image)
-   if OPTIONS.info_dict.get("board_bvb_enable", None) == "true":
-     # If we're using Brillo Verified Boot, we can now build boot.img
-     # given that we have system.img.
-     banner("boot")
-     boot_image = common.GetBootableImage(
-       "IMAGES/boot.img", "boot.img", OPTIONS.input_tmp, "BOOT",
-       system_img_path=system_img_path)
-     if boot_image:
-       boot_image.AddToZip(output_zip)
 +  vendor_img_path = None
    if has_vendor:
      banner("vendor")
 -    AddVendor(output_zip)
 +    vendor_img_path = AddVendor(output_zip)
 +  if has_system_other:
 +    banner("system_other")
 +    AddSystemOther(output_zip)
    if not OPTIONS.is_signing:
      banner("userdata")
      AddUserdata(output_zip)

diff --cc tools/releasetools/common.py
Simple merge