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

Commit 1175a7bb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to PPR1.180530.001 

Change-Id: I661654fe6ffccb7ac1eca54700f423da717a6039
parents b092f257 221be663

OWNERS

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ ccross@android.com 
dwillemsen@google.com

nanzhang@google.com



per-file * = ccross@android.com

per-file * = dwillemsen@google.com

per-file * = nanzhang@google.com



# for version updates

per-file version_defaults.mk = aseaton@google.com

per-file version_defaults.mk = elisapascual@google.com

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.180529.001
 
export BUILD_ID=PPR1.180530.001

core/version_defaults.mk

+10 −0
Original line number Diff line number Diff line
@@ -234,6 +234,16 @@ ifndef PLATFORM_SECURITY_PATCH 
      PLATFORM_SECURITY_PATCH := 2018-06-05

endif



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP

  # Used to indicate the matching timestamp for the security patch string in PLATFORM_SECURITY_PATCH.

  ifneq (,$(findstring Darwin,$(UNAME)))

    PLATFORM_SECURITY_PATCH_TIMESTAMP := $(shell date -jf '%Y-%m-%d %T %Z' '$(PLATFORM_SECURITY_PATCH) 00:00:00 GMT' +%s)

  else

    PLATFORM_SECURITY_PATCH_TIMESTAMP := $(shell date -d 'TZ="GMT" $(PLATFORM_SECURITY_PATCH)' +%s)

  endif

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP



ifndef PLATFORM_BASE_OS

  # Used to indicate the base os applied to the device.

  # Can be an arbitrary string, but must be a single word.

target/product/aosp_arm64_ab.mk

+0 −4
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ PRODUCT_PACKAGES += \ 
    update_engine \

    update_verifier



# Enable control-flow integrity (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)



PRODUCT_NAME := aosp_arm64_ab

PRODUCT_DEVICE := generic_arm64_ab

PRODUCT_BRAND := Android

target/product/core_64_bit.mk

+0 −4
Original line number Diff line number Diff line
@@ -31,7 +31,3 @@ 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)