Loading core/Makefile +14 −2 Original line number Diff line number Diff line Loading @@ -3094,18 +3094,30 @@ ifneq ($(words $(sort $(INTERNAL_AVB_PARTITIONS_IN_CHAINED_VBMETA_IMAGES))),$(wo $(error BOARD_AVB_VBMETA_SYSTEM and BOARD_AVB_VBMETA_VENDOR cannot have duplicates) endif # Appends security patch level as a AVB property descriptor # Appends os version and security patch level as a AVB property descriptor BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.system.os_version:$(PLATFORM_VERSION) \ --prop com.android.build.system.security_patch:$(PLATFORM_SECURITY_PATCH) BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.product.os_version:$(PLATFORM_VERSION) \ --prop com.android.build.product.security_patch:$(PLATFORM_SECURITY_PATCH) BOARD_AVB_PRODUCT_SERVICES_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.product_services.os_version:$(PLATFORM_VERSION) \ --prop com.android.build.product_services.security_patch:$(PLATFORM_SECURITY_PATCH) # The following vendor- and odm-specific images needs explicitly set per board. BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.boot.os_version:$(PLATFORM_VERSION) BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.vendor.os_version:$(PLATFORM_VERSION) BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.odm.os_version:$(PLATFORM_VERSION) # The following vendor- and odm-specific images needs explicit SPL set per board. ifdef BOOT_SECURITY_PATCH BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.boot.security_patch:$(BOOT_SECURITY_PATCH) Loading core/build_id.mk +1 −1 Original line number Diff line number Diff line Loading @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. BUILD_ID=QP1A.190516.006 BUILD_ID=QP1A.190519.001 core/config.mk +0 −9 Original line number Diff line number Diff line Loading @@ -808,15 +808,6 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := \ PLATFORM_SEPOLICY_VERSION \ TOT_SEPOLICY_VERSION \ ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),) ifdef PRODUCT_SHIPPING_API_LEVEL ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29)) PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true endif endif endif .KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true) ifneq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) $(error PRODUCT_USE_DYNAMIC_PARTITIONS must be true when PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \ Loading core/product_config.mk +8 −0 Original line number Diff line number Diff line Loading @@ -376,6 +376,14 @@ ifndef PRODUCT_BUILD_SUPER_PARTITION PRODUCT_BUILD_SUPER_PARTITION := $(PRODUCT_USE_DYNAMIC_PARTITIONS) endif ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),) ifdef PRODUCT_SHIPPING_API_LEVEL ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29)) PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true endif endif endif define product-overrides-config $$(foreach rule,$$(PRODUCT_$(1)_OVERRIDES),\ $$(if $$(filter 2,$$(words $$(subst :,$$(space),$$(rule)))),,\ Loading target/product/gsi/29.txt +0 −5 Original line number Diff line number Diff line Loading @@ -236,7 +236,6 @@ VNDK-core: libminijail.so VNDK-core: libmkbootimg_abi_check.so VNDK-core: libnetutils.so VNDK-core: libnl.so VNDK-core: libopus.so VNDK-core: libpcre2.so VNDK-core: libpiex.so VNDK-core: libpng.so Loading @@ -251,11 +250,8 @@ VNDK-core: libsoftkeymasterdevice.so VNDK-core: libspeexresampler.so VNDK-core: libsqlite.so VNDK-core: libssl.so VNDK-core: libstagefright_amrnb_common.so VNDK-core: libstagefright_bufferpool@2.0.so VNDK-core: libstagefright_bufferqueue_helper.so VNDK-core: libstagefright_enc_common.so VNDK-core: libstagefright_flacdec.so VNDK-core: libstagefright_foundation.so VNDK-core: libstagefright_omx.so VNDK-core: libstagefright_omx_utils.so Loading @@ -265,7 +261,6 @@ VNDK-core: libtinyalsa.so VNDK-core: libtinyxml2.so VNDK-core: libui.so VNDK-core: libusbhost.so VNDK-core: libvorbisidec.so VNDK-core: libwifi-system-iface.so VNDK-core: libxml2.so VNDK-core: libyuv.so Loading Loading
core/Makefile +14 −2 Original line number Diff line number Diff line Loading @@ -3094,18 +3094,30 @@ ifneq ($(words $(sort $(INTERNAL_AVB_PARTITIONS_IN_CHAINED_VBMETA_IMAGES))),$(wo $(error BOARD_AVB_VBMETA_SYSTEM and BOARD_AVB_VBMETA_VENDOR cannot have duplicates) endif # Appends security patch level as a AVB property descriptor # Appends os version and security patch level as a AVB property descriptor BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.system.os_version:$(PLATFORM_VERSION) \ --prop com.android.build.system.security_patch:$(PLATFORM_SECURITY_PATCH) BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.product.os_version:$(PLATFORM_VERSION) \ --prop com.android.build.product.security_patch:$(PLATFORM_SECURITY_PATCH) BOARD_AVB_PRODUCT_SERVICES_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.product_services.os_version:$(PLATFORM_VERSION) \ --prop com.android.build.product_services.security_patch:$(PLATFORM_SECURITY_PATCH) # The following vendor- and odm-specific images needs explicitly set per board. BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.boot.os_version:$(PLATFORM_VERSION) BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.vendor.os_version:$(PLATFORM_VERSION) BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.odm.os_version:$(PLATFORM_VERSION) # The following vendor- and odm-specific images needs explicit SPL set per board. ifdef BOOT_SECURITY_PATCH BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.boot.security_patch:$(BOOT_SECURITY_PATCH) Loading
core/build_id.mk +1 −1 Original line number Diff line number Diff line Loading @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. BUILD_ID=QP1A.190516.006 BUILD_ID=QP1A.190519.001
core/config.mk +0 −9 Original line number Diff line number Diff line Loading @@ -808,15 +808,6 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := \ PLATFORM_SEPOLICY_VERSION \ TOT_SEPOLICY_VERSION \ ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),) ifdef PRODUCT_SHIPPING_API_LEVEL ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29)) PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true endif endif endif .KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true) ifneq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) $(error PRODUCT_USE_DYNAMIC_PARTITIONS must be true when PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \ Loading
core/product_config.mk +8 −0 Original line number Diff line number Diff line Loading @@ -376,6 +376,14 @@ ifndef PRODUCT_BUILD_SUPER_PARTITION PRODUCT_BUILD_SUPER_PARTITION := $(PRODUCT_USE_DYNAMIC_PARTITIONS) endif ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),) ifdef PRODUCT_SHIPPING_API_LEVEL ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29)) PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true endif endif endif define product-overrides-config $$(foreach rule,$$(PRODUCT_$(1)_OVERRIDES),\ $$(if $$(filter 2,$$(words $$(subst :,$$(space),$$(rule)))),,\ Loading
target/product/gsi/29.txt +0 −5 Original line number Diff line number Diff line Loading @@ -236,7 +236,6 @@ VNDK-core: libminijail.so VNDK-core: libmkbootimg_abi_check.so VNDK-core: libnetutils.so VNDK-core: libnl.so VNDK-core: libopus.so VNDK-core: libpcre2.so VNDK-core: libpiex.so VNDK-core: libpng.so Loading @@ -251,11 +250,8 @@ VNDK-core: libsoftkeymasterdevice.so VNDK-core: libspeexresampler.so VNDK-core: libsqlite.so VNDK-core: libssl.so VNDK-core: libstagefright_amrnb_common.so VNDK-core: libstagefright_bufferpool@2.0.so VNDK-core: libstagefright_bufferqueue_helper.so VNDK-core: libstagefright_enc_common.so VNDK-core: libstagefright_flacdec.so VNDK-core: libstagefright_foundation.so VNDK-core: libstagefright_omx.so VNDK-core: libstagefright_omx_utils.so Loading @@ -265,7 +261,6 @@ VNDK-core: libtinyalsa.so VNDK-core: libtinyxml2.so VNDK-core: libui.so VNDK-core: libusbhost.so VNDK-core: libvorbisidec.so VNDK-core: libwifi-system-iface.so VNDK-core: libxml2.so VNDK-core: libyuv.so Loading