diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-10 13:41:42 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-10 14:23:24 +0000 |
| commit | acc1d95cf08911bb782684d7b4ff72b8105169fd (patch) | |
| tree | 1da85c8792a83b6cf27d9db50d65a339919cb8ee | |
| parent | 3fab185d98c73baf9921a274cf8ecaad9b45776b (diff) | |
| parent | f414e685883982f86b1ddb7c3445279dc9693e32 (diff) | |
| download | build-acc1d95cf08911bb782684d7b4ff72b8105169fd.tar.gz | |
Make change and version bump to aml_con_341210000 for mainline module file: None
Snap for 10926695 from f414e685883982f86b1ddb7c3445279dc9693e32 to mainline-conscrypt-release
Change-Id: I5c87dd12b975397cbcdb0880a80d78f9dbc93351
| -rw-r--r-- | core/OWNERS | 2 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | tools/releasetools/Android.bp | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/core/OWNERS b/core/OWNERS index eb1d5c3c46..88f6d068bb 100644 --- a/core/OWNERS +++ b/core/OWNERS @@ -5,3 +5,5 @@ per-file proguard*.flags = jdduke@google.com # For version updates per-file version_defaults.mk = aseaton@google.com,lubomir@google.com,pscovanner@google.com,bkhalife@google.com,jainne@google.com +# For sdk extensions version updates +per-file version_defaults.mk = amhk@google.com,gurpreetgs@google.com,mkhokhlova@google.com,robertogil@google.com diff --git a/core/build_id.mk b/core/build_id.mk index e4f167a1a8..b29569f03f 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=341110000 +BUILD_ID=341210000 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 77957d2bd4..ba6a1c886e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -104,7 +104,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 := 2023-10-05 + PLATFORM_SECURITY_PATCH := 2023-11-05 endif include $(BUILD_SYSTEM)/version_util.mk diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp index a76dc8a8bc..1240872a9e 100644 --- a/tools/releasetools/Android.bp +++ b/tools/releasetools/Android.bp @@ -251,6 +251,7 @@ python_library_host { "signapk", "toybox", "unpack_bootimg", + "zip2zip", ], } |