Merge "base: Update PRODUCT variable for verity on /system"

This commit is contained in:
Linux Build Service Account 2015-10-24 08:46:51 -07:00 committed by Gerrit - the friendly Code Review server
commit c31cceeb82
2 changed files with 3 additions and 2 deletions

View File

@ -859,7 +859,7 @@ PRODUCT_PACKAGE_OVERLAYS += device/qcom/common/product/overlay
-include frameworks/base/data/videos/VideoPackage1.mk
# dm-verity definitions
PRODUCT_VERITY_PARTITION=/dev/block/bootdevice/by-name/system
PRODUCT_SYSTEM_VERITY_PARTITION=/dev/block/bootdevice/by-name/system
$(call inherit-product, build/target/product/verity.mk)
#skip boot jars check

View File

@ -4,7 +4,8 @@ $(call inherit-product, device/qcom/common/base.mk)
# Since we want use QC specific files, we should inherit
# device-vendor.mk first to make sure QC specific files gets installed.
$(call inherit-product-if-exists, $(QCPATH)/common/config/device-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
PRODUCT_BRAND := qcom
PRODUCT_AAPT_CONFIG += hdpi mdpi