diff options
| author | Ed Heyl <edheyl@google.com> | 2014-05-09 05:53:54 +0000 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2014-05-09 05:53:54 +0000 |
| commit | 3e92fd0fbaf0a7366bd9b60e700948d6be2b08e4 (patch) | |
| tree | 068c233122c446c0327c3854e74310ac7ee91be0 /core | |
| parent | 5dee206d8ef106a70a5ada4b8aba9c4489f7e308 (diff) | |
| download | build-3e92fd0fbaf0a7366bd9b60e700948d6be2b08e4.zip build-3e92fd0fbaf0a7366bd9b60e700948d6be2b08e4.tar.gz build-3e92fd0fbaf0a7366bd9b60e700948d6be2b08e4.tar.bz2 | |
Fix build: Revert "Add verity support to `make dist`."
This reverts commit 5dee206d8ef106a70a5ada4b8aba9c4489f7e308.
Change-Id: I6f4f536c127d3e5dcb6594efb193231cd8dece7e
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 11 | ||||
| -rw-r--r-- | core/product.mk | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/core/Makefile b/core/Makefile index 5068595..9260128 100644 --- a/core/Makefile +++ b/core/Makefile @@ -663,11 +663,6 @@ $(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PA $(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1)) $(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_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_PARTITION)" >> $(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_SUPPORTS_VERITY),$(hide) echo "verity_mountpoint=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_MOUNTPOINT)" >> $(1)) $(if $(2),$(hide) $(foreach kv,$(2),echo "$(kv)" >> $(1);)) endef @@ -880,7 +875,11 @@ define build-systemimage-target @echo "Target system fs image: $(1)" @mkdir -p $(dir $(1)) $(systemimage_intermediates) && rm -rf $(systemimage_intermediates)/system_image_info.txt $(call generate-userimage-prop-dictionary, $(systemimage_intermediates)/system_image_info.txt, \ - skip_fsck=true) + skip_fsck=true \ + verity=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY) \ + verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_PARTITION) \ + verity_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY) \ + verity_signer_cmd=$(VERITY_SIGNER)) $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \ ./build/tools/releasetools/build_image.py \ $(TARGET_OUT) $(systemimage_intermediates)/system_image_info.txt $(1) diff --git a/core/product.mk b/core/product.mk index 5693fe9..1a7685c 100644 --- a/core/product.mk +++ b/core/product.mk @@ -104,8 +104,7 @@ _product_var_list := \ PRODUCT_OEM_PROPERTIES \ PRODUCT_SYSTEM_PROPERTY_BLACKLIST \ PRODUCT_VERITY_PARTITION \ - PRODUCT_VERITY_SIGNING_KEY \ - PRODUCT_VERITY_MOUNTPOINT + PRODUCT_VERITY_SIGNING_KEY define dump-product $(info ==== $(1) ====)\ |