diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-08 00:25:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-08 00:25:26 +0000 |
| commit | 7701db074bcb18d2f55d737d01333e9dfda1fb69 (patch) | |
| tree | 7ba8dff529b1952258547d315fe38b7f3463a753 | |
| parent | 3bf68d84a01766e11f228bcab55b579969cffda7 (diff) | |
| parent | c517b574ef6ac89eb2627793865e8d0ef3b1b22d (diff) | |
| download | build-7701db074bcb18d2f55d737d01333e9dfda1fb69.tar.gz | |
Snap for 7266504 from c517b574ef6ac89eb2627793865e8d0ef3b1b22d to mainline-networkstack-release
Change-Id: I00403857c9ca59a243caeb3098fddbc8d19b0b76
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/main.mk b/core/main.mk index ab8052e202..ce3df20087 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1745,7 +1745,7 @@ tidy_only: ndk: $(SOONG_OUT_DIR)/ndk.timestamp .PHONY: ndk -# Checks that build/soong/apex/allowed_deps.txt remains up to date +# Checks that allowed_deps.txt remains up to date ifneq ($(UNSAFE_DISABLE_APEX_ALLOWED_DEPS_CHECK),true) droidcore: ${APEX_ALLOWED_DEPS_CHECK} endif diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 9c7ac2c8f5..b32474d021 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2021-03-05 + PLATFORM_SECURITY_PATCH := 2021-05-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |