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

Unverified Commit 9315d49d authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.0.0_r18' into staging/lineage-19.0_merge-android-12.0.0_r18 

Android 12.0.0 release 18

* tag 'android-12.0.0_r18' of https://android.googlesource.com/platform/build: (27 commits)
  Version bump to SQ1D.211205.016.A1 [core/build_id.mk]
  Version bump to SQ1D.211205.016 [core/build_id.mk]
  Version bump to SQ1D.211205.015 [core/build_id.mk]
  Version bump to SQ1D.211205.014 [core/build_id.mk]
  Version bump to SQ1D.211205.013 [core/build_id.mk]
  Version bump to SQ1D.211205.012 [core/build_id.mk]
  Version bump to SQ1D.211205.011 [core/build_id.mk]
  Version bump to SQ1D.211205.010 [core/build_id.mk]
  Version bump to SQ1D.211205.009 [core/build_id.mk]
  Version bump to SQ1D.211205.008 [core/build_id.mk]
  Version bump to SQ1D.211205.007 [core/build_id.mk]
  Version bump to SQ1D.211205.006 [core/build_id.mk]
  Version bump to SQ1D.211205.005 [core/build_id.mk]
  Version bump to SQ1D.211205.004 [core/build_id.mk]
  Version bump to SQ1D.211205.003 [core/build_id.mk]
  Version bump to SQ1D.211205.002 [core/build_id.mk]
  [DO NOT MERGE] Update SPL to 2021-12-05
  Version bump to SQ1D.211001.002 [core/build_id.mk]
  Version bump to SQ1D.211001.001 [core/build_id.mk]
  Update build_id.mk and version_defaults.mk for SC QPR1
  ...

 Conflicts:
	core/build_id.mk
	core/version_defaults.mk

Change-Id: I966c984062577e96852918480fd8f29bc3568f94
parents d9f86fe1 05723a2d

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=SD1A.210817.036
 
BUILD_ID=SQ1D.211205.016.A1

core/version_defaults.mk

+5 −5
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE 
  include $(INTERNAL_BUILD_ID_MAKEFILE)

endif



DEFAULT_PLATFORM_VERSION := SP1A

MIN_PLATFORM_VERSION := SP1A

MAX_PLATFORM_VERSION := SP1A

DEFAULT_PLATFORM_VERSION := SQ1A

MIN_PLATFORM_VERSION := SQ1A

MAX_PLATFORM_VERSION := SQ1A



ALLOWED_VERSIONS := $(call allowed-platform-versions,\

  $(MIN_PLATFORM_VERSION),\
@@ -93,7 +93,7 @@ PLATFORM_VERSION_LAST_STABLE := 12 


# These are the current development codenames, if the build is not a final

# release build.  If this is a final release build, it is simply "REL".

PLATFORM_VERSION_CODENAME.SP1A := REL

PLATFORM_VERSION_CODENAME.SQ1A := REL



ifndef PLATFORM_VERSION_CODENAME

  PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
@@ -240,7 +240,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 := 2021-11-05

      PLATFORM_SECURITY_PATCH := 2021-12-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH