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

Commit e39fa5ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev 

* changes:
  [DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113
  [DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113
parents 9dbcf7c1 1517f3d2

core/version_defaults.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,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)"