Merge "Disable verity metadata for eng builds"

This commit is contained in:
Sami Tolvanen
2015-10-14 20:49:32 +00:00
committed by Gerrit Code Review

View File

@@ -14,15 +14,19 @@
# limitations under the License. # limitations under the License.
# #
# Provides dependencies necessary for verified boot # Provides dependencies necessary for verified boot (only for user and
# userdebug builds)
PRODUCT_SUPPORTS_BOOT_SIGNER := true user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))
PRODUCT_SUPPORTS_VERITY := true ifneq (,$(user_variant))
PRODUCT_SUPPORTS_BOOT_SIGNER := true
PRODUCT_SUPPORTS_VERITY := true
# The dev key is used to sign boot and recovery images, and the verity # The dev key is used to sign boot and recovery images, and the verity
# metadata table. Actual product deliverables will be re-signed by hand. # metadata table. Actual product deliverables will be re-signed by hand.
# We expect this file to exist with the suffixes ".x509.pem" and ".pk8". # We expect this file to exist with the suffixes ".x509.pem" and ".pk8".
PRODUCT_VERITY_SIGNING_KEY := build/target/product/security/verity PRODUCT_VERITY_SIGNING_KEY := build/target/product/security/verity
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
verity_key verity_key
endif