[coastguard skipped] Merge sparse cherrypicks from sparse-11004698-L28600030001056966 into mainline-adservices-release.
COASTGUARD_SKIP: I3b108e3f4ade8462f51952f4f7edb151de8026fc
Change-Id: I37f47fd1b5a8a403e477e168e6651e3153450399
diff --git a/core/OWNERS b/core/OWNERS
index eb1d5c3..88f6d06 100644
--- a/core/OWNERS
+++ b/core/OWNERS
@@ -5,3 +5,5 @@
# For version updates
per-file version_defaults.mk = [email protected],[email protected],[email protected],[email protected],[email protected]
+# For sdk extensions version updates
+per-file version_defaults.mk = [email protected],[email protected],[email protected],[email protected]
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 6bac52b..29238d5 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -128,6 +128,7 @@
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 666f577..6822afe 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=341131080
+BUILD_ID=341412000
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 77957d2..160c645 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -79,7 +79,7 @@
.KATI_READONLY := PLATFORM_SDK_VERSION
# This is the sdk extension version of this tree.
-PLATFORM_SDK_EXTENSION_VERSION := 10
+PLATFORM_SDK_EXTENSION_VERSION := 11
.KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION
# This is the sdk extension version that PLATFORM_SDK_VERSION ships with.
@@ -104,7 +104,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 := 2023-10-05
+ PLATFORM_SECURITY_PATCH := 2024-01-01
endif
include $(BUILD_SYSTEM)/version_util.mk
diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp
index a76dc8a..d07292a 100644
--- a/tools/releasetools/Android.bp
+++ b/tools/releasetools/Android.bp
@@ -236,6 +236,9 @@
"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: [
