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

Commit 541828d6 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend Committed by Yu Gu
Browse files

[conflict] [DO NOT MERGE] 2p: 0449bb97 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927

Bug: 199784479
Change-Id: I4ee0a8240ace16d1a85b637b3d70568bae289693
parents 7a72ba16 0449bb97

core/version_defaults.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,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 := 2021-10-05

    PLATFORM_SECURITY_PATCH := 2021-11-05

endif

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH

.KATI_READONLY := PLATFORM_SECURITY_PATCH