Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb441593 authored by Paul Lawrence's avatar Paul Lawrence Committed by Android Git Automerger
Browse files

am 9ebb0067: am a37b2bb2: Fix the build 

* commit '9ebb0067':
  Fix the build
parents 0cd1bbd0 9ebb0067

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ $(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(IN 
$(if $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(1))

$(hide) echo "selinux_fc=$(SELINUX_FC)" >> $(1)

$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)" >> $(1))

$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8" >> $(1))

$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY)" >> $(1))

$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_signer_cmd=$(VERITY_SIGNER)" >> $(1))

$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_VERITY_PARTITION),$(hide) echo "system_verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_VERITY_PARTITION)" >> $(1))

$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_VERITY_PARTITION),$(hide) echo "vendor_verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_VERITY_PARTITION)" >> $(1))

tools/releasetools/build_image.py

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ def MakeVerityEnabledImage(out_file, prop_dict): 
  # get properties

  image_size = prop_dict["partition_size"]

  block_dev = prop_dict["verity_block_device"]

  signer_key = prop_dict["verity_key"]

  signer_key = prop_dict["verity_key"] + ".pk8"

  signer_path = prop_dict["verity_signer_cmd"]



  # make a tempdir