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

Commit e53cb97d authored by Adam Seaton's avatar Adam Seaton Committed by android-build-merger
Browse files

Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef am: feada745 am: dbe7ec01 

am: aed422e0

Change-Id: Ifd6a64c599d045735f0c85595315679887310f18
parents ce869d60 aed422e0

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 := 2017-09-05

    PLATFORM_SECURITY_PATCH := 2017-10-05

endif

endif





ifeq "" "$(PLATFORM_BASE_OS)"

ifeq "" "$(PLATFORM_BASE_OS)"