Merge "Non-module targets." am: ff15a27bd7 am: 7c30a61bc6
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031
Change-Id: I3ee4934b40b57652945d81dea7a3f63b495ae5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/build_id.mk b/core/build_id.mk
index ba5ca42..2f9c3f3 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=AOSP.MASTER
+BUILD_ID=MASTER
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 4c56ba6..d00efd3 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -98,7 +98,7 @@
# 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 := 2022-05-05
+ PLATFORM_SECURITY_PATCH := 2022-06-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH