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

Commit 5f806cb4 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-7.0.0_r14' of https://android.googlesource.com/platform/build into cm-14.0 

Android 7.0.0 Release 14 (NBD90Z)

Change-Id: I647131e98e0214aeb1d8087aeb7f6b095452b703
parents e5729190 2af2da32

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=NRD90U
 
export BUILD_ID=NBD90Z

core/version_defaults.mk

+6 −5
Original line number Diff line number Diff line
@@ -110,10 +110,11 @@ endif 


ifeq "" "$(PLATFORM_SECURITY_PATCH)"

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

  # Must be of the form "YYYY-MM-DD" on production devices.

  #

    #  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-09-06

      PLATFORM_SECURITY_PATCH := 2016-10-05

endif



ifeq "" "$(PLATFORM_BASE_OS)"