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

Unverified Commit b3d4e399 authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab
Browse files

Merge tag 'android-8.1.0_r26' into lineage-15.1 

Android 8.1.0 Release 26 (OPM2.171019.029.B1)
parents fac4fa85 46796238

core/build_id.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# (like "CRB01").  It must be a single word, and is

# capitalized by convention.

# capitalized by convention.





export BUILD_ID=OPM2.171019.029
 
export BUILD_ID=OPM2.171019.029.B1

core/version_defaults.mk

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

    #  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.

    #  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.

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

      PLATFORM_SECURITY_PATCH := 2018-04-05

      PLATFORM_SECURITY_PATCH := 2018-05-05

endif

endif





ifndef PLATFORM_BASE_OS

ifndef PLATFORM_BASE_OS