diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-02 22:26:40 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-02 23:08:27 +0000 |
| commit | b4d2f712323b243822d091d7602e9a54b9622e49 (patch) | |
| tree | a34b61f23e992a8ec2f5ebffa89b8c582b0e4bdd | |
| parent | d0608fa1dafa85fabbdeb4af182c4b7ca054075f (diff) | |
| parent | 8dbf456e970cfe6085fb439b6b90e6944d455df1 (diff) | |
| download | build-b4d2f712323b243822d091d7602e9a54b9622e49.tar.gz | |
Make change and version bump to aml_res_341310000 for mainline module file: None
Snap for 11041982 from 8dbf456e970cfe6085fb439b6b90e6944d455df1 to mainline-resolv-release
Change-Id: Ic7046d0f0d588c6158c0bb8b32282ac912ae7fda
| -rw-r--r-- | core/OWNERS | 2 | ||||
| -rw-r--r-- | core/android_soong_config_vars.mk | 1 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 4 | ||||
| -rw-r--r-- | tools/releasetools/Android.bp | 3 |
5 files changed, 9 insertions, 3 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/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 6bac52b5ee..29238d569b 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -128,6 +128,7 @@ INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ rkpd \ uwb \ wifi \ + mediaprovider \ $(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\ $(if $(call soong_config_get,$(m)_module,source_build),,\ diff --git a/core/build_id.mk b/core/build_id.mk index e4f167a1a8..f16c958ee5 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=341310000 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 773a8fd171..d7ff5aee0d 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -79,7 +79,7 @@ endif .KATI_READONLY := PLATFORM_SDK_VERSION # This is the sdk extension version of this tree. -PLATFORM_SDK_EXTENSION_VERSION := 9 +PLATFORM_SDK_EXTENSION_VERSION := 10 .KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION # This is the sdk extension version that PLATFORM_SDK_VERSION ships with. @@ -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-12-01 endif include $(BUILD_SYSTEM)/version_util.mk diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp index a76dc8a8bc..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: [ |