Snap for 11178562 from c0661c91a5d1b4f03a67bd7b0d7a0a9575c1c771 to mainline-art-releaseaml_art_341411300android14-mainline-art-release

Change-Id: Ia45b33c6f0d1b7b9b38648afa0c483679f426245

4 files changed, 50 insertions, 5 deletions

diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index c444d466..f688d54e 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -13,14 +13,17 @@
 # See go/apex-allowed-deps-error for more details.
 # TODO(b/157465465): introduce automated quality signals and remove this list.
 
+aconfig_mediacodec_flags_c_lib(minSdkVersion:30)
 android.hardware.audio.common-V1-ndk(minSdkVersion:31)
 android.hardware.audio.common-V2-ndk(minSdkVersion:31)
+android.hardware.audio.common-V3-ndk(minSdkVersion:31)
 android.hardware.audio.common@5.0(minSdkVersion:30)
 android.hardware.bluetooth-V1-ndk(minSdkVersion:33)
 android.hardware.bluetooth.a2dp@1.0(minSdkVersion:30)
 android.hardware.bluetooth.audio-V1-ndk(minSdkVersion:31)
 android.hardware.bluetooth.audio-V2-ndk(minSdkVersion:31)
 android.hardware.bluetooth.audio-V3-ndk(minSdkVersion:31)
+android.hardware.bluetooth.audio-V4-ndk(minSdkVersion:31)
 android.hardware.bluetooth.audio@2.0(minSdkVersion:30)
 android.hardware.bluetooth.audio@2.1(minSdkVersion:30)
 android.hardware.bluetooth@1.0(minSdkVersion:30)
@@ -86,6 +89,7 @@ android.hardware.wifi-V1.4-java(minSdkVersion:30)
 android.hardware.wifi-V1.5-java(minSdkVersion:30)
 android.hardware.wifi-V1.6-java(minSdkVersion:30)
 android.hardware.wifi-V2-java(minSdkVersion:30)
+android.hardware.wifi.common-V1-java(minSdkVersion:30)
 android.hardware.wifi.hostapd-V1-java(minSdkVersion:30)
 android.hardware.wifi.hostapd-V1.0-java(minSdkVersion:30)
 android.hardware.wifi.hostapd-V1.1-java(minSdkVersion:30)
@@ -113,6 +117,8 @@ android.media.audio.common.types-V1-cpp(minSdkVersion:29)
 android.media.audio.common.types-V1-ndk(minSdkVersion:29)
 android.media.audio.common.types-V2-cpp(minSdkVersion:29)
 android.media.audio.common.types-V2-ndk(minSdkVersion:29)
+android.media.audio.common.types-V3-cpp(minSdkVersion:29)
+android.media.audio.common.types-V3-ndk(minSdkVersion:29)
 android.net.ipsec.ike.xml(minSdkVersion:(no version))
 android.security.rkpd-ndk(minSdkVersion:33)
 android.security.rkpd-rust(minSdkVersion:33)
@@ -460,7 +466,9 @@ libcfg_if(minSdkVersion:29)
 libcfg_if.rust_sysroot(minSdkVersion:29)
 libchrome(minSdkVersion:30)
 libcodec2(minSdkVersion:29)
+libcodec2_aidl(minSdkVersion:30)
 libcodec2_hal_common(minSdkVersion:29)
+libcodec2_hal_selection_static(minSdkVersion:29)
 libcodec2_headers(minSdkVersion:29)
 libcodec2_hidl@1.0(minSdkVersion:29)
 libcodec2_hidl@1.1(minSdkVersion:29)
@@ -534,6 +542,7 @@ liberror_headers(minSdkVersion:29)
 libevent(minSdkVersion:30)
 libexpat(minSdkVersion:apex_inherit)
 libexpectedutils_headers(minSdkVersion:29)
+libexpresslog_jni(minSdkVersion:30)
 libextservices(minSdkVersion:30)
 libextservices_jni(minSdkVersion:30)
 libfft2d(minSdkVersion:30)
@@ -542,6 +551,8 @@ libFLAC(minSdkVersion:29)
 libFLAC-config(minSdkVersion:29)
 libFLAC-headers(minSdkVersion:29)
 libflacextractor(minSdkVersion:29)
+libflags_rust(minSdkVersion:33)
+libflags_rust_cpp_bridge(minSdkVersion:33)
 libflatbuffers-cpp(minSdkVersion:30)
 libfmq(minSdkVersion:29)
 libfmq-base(minSdkVersion:29)
@@ -845,6 +856,7 @@ libutils_binder(minSdkVersion:apex_inherit)
 libutils_headers(minSdkVersion:29)
 libutils_headers(minSdkVersion:30)
 libutils_headers(minSdkVersion:apex_inherit)
+libuwb_aconfig_flags_rust(minSdkVersion:33)
 libuwb_uci_packets(minSdkVersion:Tiramisu)
 libvorbisidec(minSdkVersion:29)
 libvpx(minSdkVersion:29)
@@ -860,7 +872,6 @@ libzstd(minSdkVersion:(no version))
 libzstd(minSdkVersion:apex_inherit)
 lottie(minSdkVersion:16)
 marisa-trie(minSdkVersion:30)
-mdns_aidl_interface-lateststable-java(minSdkVersion:30)
 mdns_aidl_interface-V1-java(minSdkVersion:30)
 media_ndk_headers(minSdkVersion:29)
 media_plugin_headers(minSdkVersion:29)
@@ -877,6 +888,8 @@ modules-utils-binary-xml(minSdkVersion:29)
 modules-utils-build(minSdkVersion:29)
 modules-utils-build_system(minSdkVersion:29)
 modules-utils-bytesmatcher(minSdkVersion:29)
+modules-utils-expresslog(minSdkVersion:30)
+modules-utils-fastxmlserializer(minSdkVersion:29)
 modules-utils-handlerexecutor(minSdkVersion:29)
 modules-utils-list-slice(minSdkVersion:30)
 modules-utils-locallog(minSdkVersion:30)
@@ -928,6 +941,8 @@ netd_aidl_interface-V13-java(minSdkVersion:29)
 netd_aidl_interface-V13-java(minSdkVersion:30)
 netd_aidl_interface-V13-ndk(minSdkVersion:29)
 netd_aidl_interface-V13-ndk(minSdkVersion:30)
+netd_aidl_interface-V14-java(minSdkVersion:30)
+netd_aidl_interface-V14-ndk(minSdkVersion:30)
 netd_aidl_interface-V3-java(minSdkVersion:29)
 netd_aidl_interface-V5-java(minSdkVersion:29)
 netd_aidl_interface-V6-java(minSdkVersion:29)
@@ -957,6 +972,7 @@ networkstack-aidl-interfaces-V16-java(minSdkVersion:29)
 networkstack-aidl-interfaces-V17-java(minSdkVersion:29)
 networkstack-aidl-interfaces-V18-java(minSdkVersion:29)
 networkstack-aidl-interfaces-V18-java(minSdkVersion:30)
+networkstack-aidl-interfaces-V19-java(minSdkVersion:30)
 networkstack-aidl-latest(minSdkVersion:29)
 networkstack-aidl-latest(minSdkVersion:30)
 networkstack-client(minSdkVersion:29)
@@ -1217,6 +1233,7 @@ prebuilt_glide-annotation-and-compiler-prebuilt(minSdkVersion:14)
 prebuilt_glide-disklrucache-prebuilt(minSdkVersion:14)
 prebuilt_glide-gifdecoder-prebuilt(minSdkVersion:14)
 prebuilt_glide-integration-recyclerview-prebuilt(minSdkVersion:14)
+prebuilt_glide-integration-webpdecoder-prebuilt(minSdkVersion:14)
 prebuilt_glide-prebuilt(minSdkVersion:14)
 prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:29)
 prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:current)
@@ -1248,6 +1265,7 @@ resourceobserver_aidl_interface-V1-ndk(minSdkVersion:29)
 resourceobserver_aidl_interface-V1-ndk_platform(minSdkVersion:29)
 rkpd(minSdkVersion:33)
 s2-geometry-library-java(minSdkVersion:30)
+s2storage_ro(minSdkVersion:31)
 sap-api-java-static(minSdkVersion:30)
 server_configurable_flags(minSdkVersion:29)
 service-entitlement(minSdkVersion:29)
diff --git a/build/build_unbundled_mainline_module.sh b/build/build_unbundled_mainline_module.sh
index 22235e43..996ad2fc 100755
--- a/build/build_unbundled_mainline_module.sh
+++ b/build/build_unbundled_mainline_module.sh
@@ -132,6 +132,7 @@ function build_modules() {
     MODULE_BUILD_FROM_SOURCE=true \
     ${extra_build_params} \
     "${RUN_ERROR_PRONE:+"RUN_ERROR_PRONE=true"}" \
+    "${CHECK_API:+"checkapi"}" \
     apps_only \
     dist \
     lint-check
diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py
index d7627aa0..a8c21f15 100755
--- a/build/mainline_modules_sdks.py
+++ b/build/mainline_modules_sdks.py
@@ -708,6 +708,13 @@ class BuildRelease:
     preferHandling: PreferHandling = \
         PreferHandling.USE_SOURCE_CONFIG_VAR_PROPERTY
 
+    # Whether the generated snapshots should include flagged APIs. Defaults to
+    # false because flagged APIs are not suitable for use outside Android.
+    include_flagged_apis: bool = False
+
+    # Whether the build release should generate Gantry metadata and API diff.
+    generate_gantry_metadata_and_api_diff: bool = False
+
     def __post_init__(self):
         # The following use object.__setattr__ as this object is frozen and
         # attempting to set the fields directly would cause an exception to be
@@ -728,6 +735,11 @@ class BuildRelease:
                     # snapshot suitable for a specific target build release.
                     "SOONG_SDK_SNAPSHOT_TARGET_BUILD_RELEASE": self.name,
                 })
+        # Unless flagged APIs are required to be included in the snapshot then
+        # tell the build to hide them.
+        if not self.include_flagged_apis:
+            self.soong_env["SOONG_SDK_SNAPSHOT_HIDE_FLAGGED_APIS"] = "true"
+
 
     def __eq__(self, other):
         return self.ordinal == other.ordinal
@@ -809,6 +821,16 @@ UpsideDownCake = BuildRelease(
 # Insert additional BuildRelease definitions for following releases here,
 # before LATEST.
 
+# A build release for the latest build excluding flagged apis.
+NEXT = BuildRelease(
+    name="next",
+    creator=create_latest_sdk_snapshots,
+    # There are no build release specific environment variables to pass to
+    # Soong.
+    soong_env={},
+    generate_gantry_metadata_and_api_diff=True,
+)
+
 # The build release for the latest build supported by this build, i.e. the
 # current build. This must be the last BuildRelease defined in this script.
 LATEST = BuildRelease(
@@ -817,6 +839,10 @@ LATEST = BuildRelease(
     # There are no build release specific environment variables to pass to
     # Soong.
     soong_env={},
+    # Latest must include flagged APIs because it may be dropped into the main
+    # Android branches.
+    include_flagged_apis=True,
+    generate_gantry_metadata_and_api_diff=True,
 )
 
 
@@ -1253,7 +1279,7 @@ class SdkDistProducer:
         modules = [m for m in modules if not m.is_bundled()]
         snapshots_dir = self.snapshot_builder.build_snapshots(
             build_release, modules)
-        if build_release == LATEST:
+        if build_release.generate_gantry_metadata_and_api_diff:
             target_dict = self.snapshot_builder.build_sdk_scope_targets(
                 build_release, modules)
             self.snapshot_builder.build_snapshot_gantry_metadata_and_api_diff(
@@ -1301,7 +1327,7 @@ class SdkDistProducer:
         for module in modules:
             for sdk in module.sdks:
                 sdk_dist_dir = os.path.join(build_release_dist_dir, SDK_VERSION)
-                if build_release == LATEST:
+                if build_release.generate_gantry_metadata_and_api_diff:
                     self.dist_sdk_snapshot_gantry_metadata_and_api_diff(
                         sdk_dist_dir, sdk, module, snapshots_dir)
                 self.populate_dist_snapshot(build_release, module, sdk,
diff --git a/tools/finalize_sdk.py b/tools/finalize_sdk.py
index a4680258..30c43a3a 100755
--- a/tools/finalize_sdk.py
+++ b/tools/finalize_sdk.py
@@ -23,9 +23,9 @@ BUILD_TARGET_TRAIN = 'train_build'
 # This build target is used when fetching from a non-train build (XXXXXXXX)
 BUILD_TARGET_CONTINUOUS = 'mainline_modules_sdks-userdebug'
 # The glob of sdk artifacts to fetch from remote build
-ARTIFACT_PATTERN = 'mainline-sdks/for-latest-build/current/{module_name}/sdk/*.zip'
+ARTIFACT_PATTERN = 'mainline-sdks/for-next-build/current/{module_name}/sdk/*.zip'
 # The glob of sdk artifacts to fetch from local build
-ARTIFACT_LOCAL_PATTERN = 'out/dist/mainline-sdks/for-latest-build/current/{module_name}/sdk/*.zip'
+ARTIFACT_LOCAL_PATTERN = 'out/dist/mainline-sdks/for-next-build/current/{module_name}/sdk/*.zip'
 COMMIT_TEMPLATE = """Finalize artifacts for extension SDK %d
 
 Import from build id %s.