diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-01 11:00:35 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-01 11:42:42 +0000 |
| commit | 45c75a81b23638cad5cb95f553e5d97896b6269d (patch) | |
| tree | a34b61f23e992a8ec2f5ebffa89b8c582b0e4bdd | |
| parent | acc1d95cf08911bb782684d7b4ff72b8105169fd (diff) | |
| parent | 8dbf456e970cfe6085fb439b6b90e6944d455df1 (diff) | |
| download | build-45c75a81b23638cad5cb95f553e5d97896b6269d.tar.gz | |
Make change and version bump to aml_con_341310000 for mainline module file: None
Snap for 11034692 from 8dbf456e970cfe6085fb439b6b90e6944d455df1 to mainline-conscrypt-release
Change-Id: I5e9dbf2fe481abe188b14fa8fa7126535f405203
| -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 | 2 | ||||
| -rw-r--r-- | tools/releasetools/Android.bp | 4 |
4 files changed, 6 insertions, 3 deletions
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 b29569f03f..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=341210000 +BUILD_ID=341310000 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", ], } |