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

Commit 5ab20558 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat

parents e93da0b7 2661552c

core/version_defaults.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -131,7 +131,7 @@ ifeq "" "$(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 := 2020-01-05

    PLATFORM_SECURITY_PATCH := 2020-02-05

endif

endif





ifeq "" "$(PLATFORM_BASE_OS)"

ifeq "" "$(PLATFORM_BASE_OS)"