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

Unverified Commit a542ab45 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r14' into staging/lineage-21.0_merge-android-14.0.0_r14 

Android 14.0.0 release 14

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZUmd5AAKCRDorT+BmrEO
# eJijAJ9XrOCq/ChE+FJrbirz8vvUQ98zAwCgkYL/h3eVHfCxRrflBdLoubzxW9w=
# =gXPz
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Nov  7 04:16:04 2023 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2037 signatures in the past
#      2 years.  Encrypted 4 messages in the past 22 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Android Build Coastguard Worker (6) and Ankur Bakshi (2)
# Via Android Build Coastguard Worker
* tag 'android-14.0.0_r14':
  Version bump to UP1A.231105.003 [core/build_id.mk]
  Version bump to UP1A.231105.002.X2 [core/build_id.mk]
  Version bump to UP1A.231105.002.X1 [core/build_id.mk]
  Version bump to UP1A.231105.002.A1 [core/build_id.mk]
  Update Security String to 2023-11-01
  Version bump to UP1A.231105.001.A1 [core/build_id.mk]
  Update Security String to 2023-11-05
  Version bump to UP1A.231005.007.A1 [core/build_id.mk]

Change-Id: Iead594de6063cbfa356d2ef3b1ef8d8be770a250
parents d6fcaaf5 b35e3ff0

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.



BUILD_ID=UP1A.231005.007
 
BUILD_ID=UP1A.231105.003

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

    PLATFORM_SECURITY_PATCH := 2023-10-05

    PLATFORM_SECURITY_PATCH := 2023-11-01

endif



include $(BUILD_SYSTEM)/version_util.mk