diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-21 12:00:50 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-21 12:43:12 +0000 |
| commit | b98eab1644e0a6bf3189c95e8a0f6e3fbf6731be (patch) | |
| tree | 24aacbf684c98d0f25fa89af1ff2cd894f1762c8 | |
| parent | ae9f68fda56c07ddf7b1644fd319c2a3e0c65863 (diff) | |
| parent | 8dbf456e970cfe6085fb439b6b90e6944d455df1 (diff) | |
| download | build-b98eab1644e0a6bf3189c95e8a0f6e3fbf6731be.tar.gz | |
Make change and version bump to aml_swc_341214000 for mainline module file: None
Snap for 10983763 from 8dbf456e970cfe6085fb439b6b90e6944d455df1 to mainline-media-swcodec-release
Change-Id: I5032ff693d4a596e64f9e221797b9500aff13ed4
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | tools/releasetools/Android.bp | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 65c9bee10d..c059a70117 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=341213000 +BUILD_ID=341214000 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index ba6a1c886e..d7ff5aee0d 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-11-05 + PLATFORM_SECURITY_PATCH := 2023-12-01 endif include $(BUILD_SYSTEM)/version_util.mk diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp index 1240872a9e..d07292a082 100644 --- a/tools/releasetools/Android.bp +++ b/tools/releasetools/Android.bp @@ -236,6 +236,9 @@ python_library_host { "rangelib.py", "sparse_img.py", ], + data: [ + ":zip2zip", + ], // Only the tools that are referenced directly are listed as required modules. For example, // `avbtool` is not here, as the script always uses the one from info_dict['avb_avbtool']. required: [ @@ -251,7 +254,6 @@ python_library_host { "signapk", "toybox", "unpack_bootimg", - "zip2zip", ], } |