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

Commit 90659a11 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to PPR1.180527.001 

Change-Id: Ib44c37c28dcce877d9628f46237baf0d9340700c
parents 0f6dc7d8 014d1fc9

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2409,7 +2409,8 @@ $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,ot 
OTATOOLS_DEPS := \

  system/extras/verity/build_verity_metadata.py \

  system/extras/ext4_utils/mke2fs.conf \

  external/avb/test/data/testkey_rsa4096.pem \

  $(sort $(shell find external/avb/test/data -type f -name "testkey_*.pem" -o \

      -name "atx_metadata.bin")) \

  $(sort $(shell find system/update_engine/scripts -name \*.pyc -prune -o -type f -print)) \

  $(sort $(shell find build/target/product/security -type f -name \*.x509.pem -o -name \*.pk8 -o \

      -name verity_key)) \

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=PPR1.180524.006
 
export BUILD_ID=PPR1.180527.001

core/config_sanitizers.mk

+10 −8
Original line number Diff line number Diff line
@@ -96,8 +96,9 @@ ifeq ($(LOCAL_SANITIZE),never) 
  my_sanitize_diag :=

endif



# Enable CFI in included paths.

# Enable CFI in included paths (for Arm64 only).

ifeq ($(filter cfi, $(my_sanitize)),)

  ifneq ($(filter arm64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)

    combined_include_paths := $(CFI_INCLUDE_PATHS) \

                              $(PRODUCT_CFI_INCLUDE_PATHS)
@@ -107,6 +108,7 @@ ifeq ($(filter cfi, $(my_sanitize)),) 
      my_sanitize_diag := cfi $(my_sanitize_diag)

    endif

  endif

endif



# If CFI is disabled globally, remove it from my_sanitize.

ifeq ($(strip $(ENABLE_CFI)),false)

target/product/aosp_arm64_ab.mk

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ PRODUCT_PACKAGES += \ 
    update_verifier



# Enable control-flow integrity (CFI) for security sensitive components

$(call inherit-product, build/make/target/product/cfi-common.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/cfi-common.mk)

$(call inherit-product-if-exists, vendor/google/products/cfi-vendor.mk)



PRODUCT_NAME := aosp_arm64_ab

PRODUCT_DEVICE := generic_arm64_ab

target/product/core_64_bit.mk

+4 −0
Original line number Diff line number Diff line
@@ -31,3 +31,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 


TARGET_SUPPORTS_32_BIT_APPS := true

TARGET_SUPPORTS_64_BIT_APPS := true



# Enable CFI for security-sensitive components

$(call inherit-product, $(SRC_TARGET_DIR)/product/cfi-common.mk)

$(call inherit-product-if-exists, vendor/google/products/cfi-vendor.mk)