aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-04-12 23:38:38 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-04-12 23:38:38 +0000
commitb66839635031dee2886d49578ab9a777673e3200 (patch)
tree7ba8dff529b1952258547d315fe38b7f3463a753
parent5e3d78c1c5baa6183f2138e284a0705f5a698863 (diff)
parentc517b574ef6ac89eb2627793865e8d0ef3b1b22d (diff)
downloadbuild-android11-mainline-documentsui-release.tar.gz
Snap for 7277594 from c517b574ef6ac89eb2627793865e8d0ef3b1b22d to mainline-documentsui-releaseandroid-mainline-11.0.0_r38android11-mainline-documentsui-release
Change-Id: I3126f5e380050c4041b033f3524a2802c9fe640f
-rw-r--r--core/main.mk2
-rw-r--r--core/version_defaults.mk2
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