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

Commit 62366951 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r74' into HEAD 

CYNGNOS-3303

Android 6.0.1 release 74

Change-Id: Ie96480de0df00e2d4c7d298f53e4f102aad5c823
parents c5ac5475 c3c1d432

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=M4B30X
 
export BUILD_ID=MOB31K

core/version_defaults.mk

+6 −4
Original line number Diff line number Diff line
@@ -100,10 +100,12 @@ endif 


ifeq "" "$(PLATFORM_SECURITY_PATCH)"

  # Used to indicate the security patch that has been applied to the device.

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

  #  It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin.

  #  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 := 2016-10-05

  PLATFORM_SECURITY_PATCH := 2016-11-05

endif



ifeq "" "$(PLATFORM_BASE_OS)"