Snap for 11041982 from 34c895b7fdc523c62bc09b14ceb88ec48879f8b3 to mainline-uwb-releaseaml_uwb_341310300aml_uwb_341310030android14-mainline-uwb-release

Change-Id: Ie1976214a0a93c71e472d31cced013ebe25d674c

13 files changed, 225 insertions, 85 deletions

diff --git a/PREBUILTS_MODULE_OWNERS b/PREBUILTS_MODULE_OWNERS
index 1b07d0e2..064f1599 100644
--- a/PREBUILTS_MODULE_OWNERS
+++ b/PREBUILTS_MODULE_OWNERS
@@ -18,3 +18,5 @@ robertogil@google.com #{LAST_RESORT_SUGGESTION}
 paulduffin@google.com #{LAST_RESORT_SUGGESTION}
 amhk@google.com #{LAST_RESORT_SUGGESTION}
 gurpreetgs@google.com #{LAST_RESORT_SUGGESTION}
+hsnali@google.com #{LAST_RESORT_SUGGESTION}
+kalyssa@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 49e66d4a..69ab6b5a 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -52,6 +52,7 @@ android.hardware.graphics.mapper@3.0(minSdkVersion:29)
 android.hardware.graphics.mapper@4.0(minSdkVersion:29)
 android.hardware.media.bufferpool2-V1-ndk(minSdkVersion:29)
 android.hardware.media.bufferpool@2.0(minSdkVersion:29)
+android.hardware.media.c2-V1-ndk(minSdkVersion:30)
 android.hardware.media.c2@1.0(minSdkVersion:29)
 android.hardware.media.c2@1.1(minSdkVersion:29)
 android.hardware.media.c2@1.2(minSdkVersion:29)
@@ -72,7 +73,7 @@ android.hardware.security.rkp-V3-java(minSdkVersion:33)
 android.hardware.tetheroffload.config-V1.0-java(minSdkVersion:current)
 android.hardware.tetheroffload.control-V1.0-java(minSdkVersion:current)
 android.hardware.tetheroffload.control-V1.1-java(minSdkVersion:current)
-android.hardware.threadnetwork-V1-ndk(minSdkVersion:33)
+android.hardware.threadnetwork-V1-ndk(minSdkVersion:30)
 android.hardware.uwb-V1-ndk(minSdkVersion:Tiramisu)
 android.hardware.uwb-V1-rust(minSdkVersion:Tiramisu)
 android.hardware.wifi-V1-java(minSdkVersion:30)
@@ -143,6 +144,8 @@ androidx.collection_collection-ktx(minSdkVersion:24)
 androidx.concurrent_concurrent-futures(minSdkVersion:24)
 androidx.constraintlayout_constraintlayout-core(minSdkVersion:24)
 androidx.coordinatorlayout_coordinatorlayout(minSdkVersion:14)
+androidx.core.uwb.backend.aidl_interface-V1-java(minSdkVersion:30)
+androidx.core.uwb.backend.aidl_interface-V2-java(minSdkVersion:30)
 androidx.core_core(minSdkVersion:14)
 androidx.core_core-ktx(minSdkVersion:14)
 androidx.cursoradapter_cursoradapter(minSdkVersion:14)
@@ -257,6 +260,15 @@ clatd(minSdkVersion:30)
 codecs_g711dec(minSdkVersion:29)
 com.android.vcard(minSdkVersion:9)
 com.google.android.material_material(minSdkVersion:14)
+com.uwb.support.base(minSdkVersion:30)
+com.uwb.support.ccc(minSdkVersion:30)
+com.uwb.support.dltdoa(minSdkVersion:30)
+com.uwb.support.fira(minSdkVersion:30)
+com.uwb.support.generic(minSdkVersion:30)
+com.uwb.support.multichip(minSdkVersion:30)
+com.uwb.support.oemextension(minSdkVersion:30)
+com.uwb.support.profile(minSdkVersion:30)
+com.uwb.support.radar(minSdkVersion:30)
 connectivity_native_aidl_interface-V1-java(minSdkVersion:30)
 conscrypt(minSdkVersion:29)
 core-libart(minSdkVersion:31)
@@ -265,12 +277,14 @@ crtbegin_dynamic(minSdkVersion:16)
 crtbegin_dynamic(minSdkVersion:apex_inherit)
 crtbegin_dynamic1(minSdkVersion:apex_inherit)
 crtbegin_so(minSdkVersion:16)
+crtbegin_so(minSdkVersion:29)
 crtbegin_so(minSdkVersion:30)
 crtbegin_so(minSdkVersion:apex_inherit)
 crtbegin_so(minSdkVersion:current)
 crtbegin_so(minSdkVersion:VanillaIceCream)
 crtbegin_so1(minSdkVersion:apex_inherit)
 crtbrand(minSdkVersion:16)
+crtbrand(minSdkVersion:29)
 crtbrand(minSdkVersion:30)
 crtbrand(minSdkVersion:apex_inherit)
 crtbrand(minSdkVersion:current)
@@ -278,6 +292,7 @@ crtbrand(minSdkVersion:VanillaIceCream)
 crtend_android(minSdkVersion:16)
 crtend_android(minSdkVersion:apex_inherit)
 crtend_so(minSdkVersion:16)
+crtend_so(minSdkVersion:29)
 crtend_so(minSdkVersion:30)
 crtend_so(minSdkVersion:apex_inherit)
 crtend_so(minSdkVersion:current)
@@ -288,6 +303,7 @@ dlmalloc(minSdkVersion:apex_inherit)
 dnsproxyd_protocol_headers(minSdkVersion:29)
 dnsproxyd_protocol_headers(minSdkVersion:30)
 DocumentsUI-res-lib(minSdkVersion:29)
+ethtool(minSdkVersion:30)
 exoplayer-annotation_stubs(minSdkVersion:16)
 exoplayer-media_apex(minSdkVersion:16)
 exoplayer-mediaprovider-core(minSdkVersion:16)
@@ -363,6 +379,8 @@ kotlinx_coroutines(minSdkVersion:28)
 kotlinx_coroutines_android(minSdkVersion:28)
 ksoap2(minSdkVersion:30)
 libaacextractor(minSdkVersion:29)
+libaconfig_java_proto_lite(minSdkVersion:34)
+libaconfig_java_proto_lite(minSdkVersion:UpsideDownCake)
 libadbconnection_server(minSdkVersion:(no version))
 libadbconnection_server(minSdkVersion:30)
 libadbd_core(minSdkVersion:(no version))
@@ -454,6 +472,7 @@ libcodec2_soft_amrnbdec(minSdkVersion:29)
 libcodec2_soft_amrnbenc(minSdkVersion:29)
 libcodec2_soft_amrwbdec(minSdkVersion:29)
 libcodec2_soft_amrwbenc(minSdkVersion:29)
+libcodec2_soft_av1dec_dav1d(minSdkVersion:29)
 libcodec2_soft_av1dec_gav1(minSdkVersion:29)
 libcodec2_soft_av1enc(minSdkVersion:29)
 libcodec2_soft_avcdec(minSdkVersion:29)
@@ -496,6 +515,9 @@ libcutils_headers(minSdkVersion:29)
 libcutils_sockets(minSdkVersion:29)
 libcxx(minSdkVersion:29)
 libcxxbridge05(minSdkVersion:29)
+libdav1d(minSdkVersion:29)
+libdav1d_16bit(minSdkVersion:29)
+libdav1d_8bit(minSdkVersion:29)
 libdexfile_external_headers(minSdkVersion:31)
 libdexfile_support(minSdkVersion:31)
 libdiagnose_usb(minSdkVersion:(no version))
@@ -663,7 +685,9 @@ libnet_utils_device_common_bpfjni(minSdkVersion:30)
 libnet_utils_device_common_bpfutils(minSdkVersion:30)
 libnetdbinder_utils_headers(minSdkVersion:29)
 libnetdutils(minSdkVersion:29)
+libnetdutils(minSdkVersion:30)
 libnetjniutils(minSdkVersion:29)
+libnetjniutils(minSdkVersion:30)
 libnetworkstackutilsjni(minSdkVersion:29)
 libnetworkstackutilsjni(minSdkVersion:30)
 libneuralnetworks_common(minSdkVersion:(no version))
@@ -814,6 +838,9 @@ libutf(minSdkVersion:14)
 libutils(minSdkVersion:29)
 libutils(minSdkVersion:30)
 libutils(minSdkVersion:apex_inherit)
+libutils_binder(minSdkVersion:29)
+libutils_binder(minSdkVersion:30)
+libutils_binder(minSdkVersion:apex_inherit)
 libutils_headers(minSdkVersion:29)
 libutils_headers(minSdkVersion:30)
 libutils_headers(minSdkVersion:apex_inherit)
@@ -868,17 +895,27 @@ ndk_libc++_static(minSdkVersion:16)
 ndk_libc++abi(minSdkVersion:(no version))
 ndk_libc++abi(minSdkVersion:16)
 ndk_libunwind(minSdkVersion:16)
+ndk_system(minSdkVersion:(no version))
 net-utils-device-common(minSdkVersion:29)
+net-utils-device-common(minSdkVersion:30)
 net-utils-device-common-bpf(minSdkVersion:29)
+net-utils-device-common-bpf(minSdkVersion:30)
 net-utils-device-common-ip(minSdkVersion:29)
+net-utils-device-common-ip(minSdkVersion:30)
 net-utils-device-common-netlink(minSdkVersion:29)
+net-utils-device-common-netlink(minSdkVersion:30)
 net-utils-device-common-struct(minSdkVersion:29)
+net-utils-device-common-struct(minSdkVersion:30)
 net-utils-framework-common(minSdkVersion:29)
+net-utils-framework-common(minSdkVersion:30)
 net-utils-framework-common(minSdkVersion:current)
 net-utils-services-common(minSdkVersion:30)
+netbpfload(minSdkVersion:30)
 netd-client(minSdkVersion:29)
+netd-client(minSdkVersion:30)
 netd_aidl_interface-java(minSdkVersion:29)
 netd_aidl_interface-lateststable-java(minSdkVersion:29)
+netd_aidl_interface-lateststable-java(minSdkVersion:30)
 netd_aidl_interface-lateststable-ndk(minSdkVersion:29)
 netd_aidl_interface-V10-java(minSdkVersion:29)
 netd_aidl_interface-V10-ndk(minSdkVersion:29)
@@ -887,7 +924,9 @@ netd_aidl_interface-V11-ndk(minSdkVersion:29)
 netd_aidl_interface-V12-java(minSdkVersion:29)
 netd_aidl_interface-V12-ndk(minSdkVersion:29)
 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-V3-java(minSdkVersion:29)
 netd_aidl_interface-V5-java(minSdkVersion:29)
 netd_aidl_interface-V6-java(minSdkVersion:29)
@@ -898,9 +937,12 @@ netd_aidl_interface-V9-java(minSdkVersion:29)
 netd_aidl_interface-V9-ndk(minSdkVersion:29)
 netd_event_listener_interface-java(minSdkVersion:29)
 netd_event_listener_interface-lateststable-java(minSdkVersion:29)
+netd_event_listener_interface-lateststable-java(minSdkVersion:30)
 netd_event_listener_interface-ndk_platform(minSdkVersion:29)
 netd_event_listener_interface-V1-java(minSdkVersion:29)
+netd_event_listener_interface-V1-java(minSdkVersion:30)
 netd_event_listener_interface-V1-ndk(minSdkVersion:29)
+netd_event_listener_interface-V1-ndk(minSdkVersion:30)
 netd_event_listener_interface-V1-ndk_platform(minSdkVersion:29)
 netd_mainline_headers(minSdkVersion:29)
 netlink-client(minSdkVersion:29)
@@ -1173,6 +1215,7 @@ prebuilt_firebase-messaging-aar(minSdkVersion:14)
 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-prebuilt(minSdkVersion:14)
 prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:29)
 prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:current)
@@ -1260,6 +1303,7 @@ tflite_support_libz(minSdkVersion:30)
 tflite_support_metadata_extractor(minSdkVersion:30)
 tflite_support_task_core_proto(minSdkVersion:30)
 tflite_support_tokenizers(minSdkVersion:30)
+uwb_androidx_backend(minSdkVersion:30)
 wifi-lite-protos(minSdkVersion:30)
 wifi-nano-protos(minSdkVersion:30)
 wifi-service-pre-jarjar(minSdkVersion:30)
diff --git a/build/build_unbundled_mainline_module.sh b/build/build_unbundled_mainline_module.sh
index 34c8ff72..22235e43 100755
--- a/build/build_unbundled_mainline_module.sh
+++ b/build/build_unbundled_mainline_module.sh
@@ -55,7 +55,6 @@ readonly -a DEFAULT_MODULES=(
   com.android.resolv
   com.android.runtime
   com.android.sdkext
-  com.android.sepolicy
   # TODO(b/210694291): include tethering module in the build
   # com.android.tethering
   com.android.tzdata
diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py
index 3412bbc3..d7627aa0 100755
--- a/build/mainline_modules_sdks.py
+++ b/build/mainline_modules_sdks.py
@@ -322,6 +322,9 @@ class SnapshotBuilder:
     # The out/soong/mainline-sdks directory.
     mainline_sdks_dir: str = ""
 
+    # True if apex-allowed-deps-check is to be skipped.
+    skip_allowed_deps_check: bool = False
+
     def __post_init__(self):
         self.mainline_sdks_dir = os.path.join(self.out_dir,
                                               "soong/mainline-sdks")
@@ -356,8 +359,9 @@ class SnapshotBuilder:
             f"TARGET_BUILD_VARIANT={target_build_variant}",
             "TARGET_PRODUCT=mainline_sdk",
             "MODULE_BUILD_FROM_SOURCE=true",
-            "out/soong/apex/depsinfo/new-allowed-deps.txt.check",
         ] + target_paths
+        if not self.skip_allowed_deps_check:
+            cmd += ["apex-allowed-deps-check"]
         print_command(extraEnv, cmd)
         env = os.environ.copy()
         env.update(extraEnv)
@@ -918,8 +922,7 @@ class MainlineModule:
 
         # If the module is optional then it needs its own Soong config
         # variable to allow it to be managed separately from other modules.
-        if (self.last_optional_release and
-                self.last_optional_release > build_release):
+        if self.last_optional_release:
             config_var = ConfigVar(
                 namespace=f"{self.short_name}_module",
                 name="source_build",
@@ -1053,6 +1056,10 @@ MAINLINE_MODULES = [
         for_r_build=ForRBuild(sdk_libraries=[
             SdkLibrary(name="framework-mediaprovider"),
         ]),
+        # MP is a mandatory mainline module but in some cases (b/294190883) this
+        # needs to be optional for Android Go on T. GTS tests might be needed to
+        # to check the specific condition mentioned in the bug.
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.ondevicepersonalization",
@@ -1421,7 +1428,7 @@ def apply_transformations(producer, tmp_dir, transformations, build_release):
         os.utime(path, (modified, modified))
 
 
-def create_producer(tool_path):
+def create_producer(tool_path, skip_allowed_deps_check):
     # Variables initialized from environment variables that are set by the
     # calling mainline_modules_sdks.sh.
     out_dir = os.environ["OUT_DIR"]
@@ -1436,6 +1443,7 @@ def create_producer(tool_path):
         tool_path=tool_path,
         subprocess_runner=subprocess_runner,
         out_dir=out_dir,
+        skip_allowed_deps_check=skip_allowed_deps_check,
     )
     return SdkDistProducer(
         subprocess_runner=subprocess_runner,
@@ -1531,6 +1539,11 @@ def main(args):
         "Defaults to true when TARGET_BUILD_APPS is not set. "
         "Applicable only if the \"latest\" build release is built.",
     )
+    args_parser.add_argument(
+        "--skip-allowed-deps-check",
+        action="store_true",
+        help="Skip apex-allowed-deps-check.",
+    )
     args = args_parser.parse_args(args)
 
     build_releases = ALL_BUILD_RELEASES
@@ -1550,7 +1563,7 @@ def main(args):
     if not target_build_apps or args.build_platform_sdks_for_mainline:
         modules += PLATFORM_SDKS_FOR_MAINLINE
 
-    producer = create_producer(args.tool_path)
+    producer = create_producer(args.tool_path, args.skip_allowed_deps_check)
     producer.dist_generate_sdk_supported_modules_file(modules)
     producer.produce_dist(modules, build_releases)
 
diff --git a/build/mainline_modules_sdks_test.py b/build/mainline_modules_sdks_test.py
index c9e57764..ba4421d8 100644
--- a/build/mainline_modules_sdks_test.py
+++ b/build/mainline_modules_sdks_test.py
@@ -607,6 +607,21 @@ class TestAndroidBpTransformations(unittest.TestCase):
 
         self.apply_transformations(src, transformations, mm.Tiramisu, expected)
 
+    def test_optional_mainline_module_latest(self):
+        """Tests the transformations applied to an optional mainline sdk LATEST.
+
+        This uses wifi as an example of a optional mainline sdk. This checks
+        that the use_source_config_var property is inserted.
+        """
+        src = read_test_data("wifi_Android.bp.input")
+
+        expected = read_test_data("wifi_latest_Android.bp.expected")
+
+        module = MAINLINE_MODULES_BY_APEX["com.android.wifi"]
+        transformations = module.transformations(mm.LATEST, mm.Sdk)
+
+        self.apply_transformations(src, transformations, mm.LATEST, expected)
+
     def test_art(self):
         """Tests the transformations applied to a the ART mainline module.
 
diff --git a/build/mainline_modules_sdks_test_data/wifi_latest_Android.bp.expected b/build/mainline_modules_sdks_test_data/wifi_latest_Android.bp.expected
new file mode 100644
index 00000000..51d700e1
--- /dev/null
+++ b/build/mainline_modules_sdks_test_data/wifi_latest_Android.bp.expected
@@ -0,0 +1,124 @@
+// This is auto-generated. DO NOT EDIT.
+
+package {
+    // A default list here prevents the license LSC from adding its own list which would
+    // be unnecessary as every module in the sdk already has its own licenses property.
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+prebuilt_bootclasspath_fragment {
+    name: "com.android.wifi-bootclasspath-fragment",
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
+    use_source_config_var: {
+        config_namespace: "wifi_module",
+        var_name: "source_build",
+    },
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.wifi"],
+    licenses: ["wifi-module-sdk_Android-Apache-2.0"],
+    contents: ["framework-wifi"],
+    fragments: [
+        {
+            apex: "com.android.art",
+            module: "art-bootclasspath-fragment",
+        },
+    ],
+    hidden_api: {
+        unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
+        max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-low-priority.txt"],
+        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
+        annotation_flags: "hiddenapi/annotation-flags.csv",
+        metadata: "hiddenapi/metadata.csv",
+        index: "hiddenapi/index.csv",
+        signature_patterns: "hiddenapi/signature-patterns.csv",
+        filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
+        filtered_flags: "hiddenapi/filtered-flags.csv",
+    },
+}
+
+java_sdk_library_import {
+    name: "framework-wifi",
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
+    use_source_config_var: {
+        config_namespace: "wifi_module",
+        var_name: "source_build",
+    },
+    visibility: ["//visibility:public"],
+    apex_available: [
+        "com.android.wifi",
+        "test_com.android.wifi",
+    ],
+    licenses: ["wifi-module-sdk_Android-Apache-2.0"],
+    shared_library: false,
+    permitted_packages: [
+        "android.hardware.wifi",
+        "android.net.wifi",
+        "com.android.wifi.x",
+    ],
+    public: {
+        jars: ["sdk_library/public/framework-wifi-stubs.jar"],
+        stub_srcs: ["sdk_library/public/framework-wifi_stub_sources"],
+        current_api: "sdk_library/public/framework-wifi.txt",
+        removed_api: "sdk_library/public/framework-wifi-removed.txt",
+        annotations: "sdk_library/public/framework-wifi_annotations.zip",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/framework-wifi-stubs.jar"],
+        stub_srcs: ["sdk_library/system/framework-wifi_stub_sources"],
+        current_api: "sdk_library/system/framework-wifi.txt",
+        removed_api: "sdk_library/system/framework-wifi-removed.txt",
+        annotations: "sdk_library/system/framework-wifi_annotations.zip",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/framework-wifi-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/framework-wifi_stub_sources"],
+        current_api: "sdk_library/module-lib/framework-wifi.txt",
+        removed_api: "sdk_library/module-lib/framework-wifi-removed.txt",
+        annotations: "sdk_library/module-lib/framework-wifi_annotations.zip",
+        sdk_version: "module_current",
+    },
+}
+
+java_import {
+    name: "service-wifi",
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
+    use_source_config_var: {
+        config_namespace: "wifi_module",
+        var_name: "source_build",
+    },
+    visibility: [
+        "//frameworks/opt/net/wifi/service/apex",
+        "//frameworks/opt/net/wifi/tests/wifitests/apex",
+        "//packages/modules/Wifi/apex",
+        "//packages/modules/Wifi/service",
+        "//packages/modules/Wifi/service/tests/wifitests/apex",
+    ],
+    apex_available: [
+        "com.android.wifi",
+        "test_com.android.wifi",
+    ],
+    licenses: ["wifi-module-sdk_Android-Apache-2.0"],
+    jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-wifi.jar"],
+}
+
+license {
+    name: "wifi-module-sdk_Android-Apache-2.0",
+    visibility: ["//visibility:private"],
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["licenses/build/soong/licenses/LICENSE"],
+}
+
+prebuilt_systemserverclasspath_fragment {
+    name: "com.android.wifi-systemserverclasspath-fragment",
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
+    use_source_config_var: {
+        config_namespace: "wifi_module",
+        var_name: "source_build",
+    },
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.wifi"],
+    licenses: ["wifi-module-sdk_Android-Apache-2.0"],
+    standalone_contents: ["service-wifi"],
+}
diff --git a/javatests/com/android/modules/apkinapex/Android.bp b/javatests/com/android/modules/apkinapex/Android.bp
index ee16fd6f..661a1dfa 100644
--- a/javatests/com/android/modules/apkinapex/Android.bp
+++ b/javatests/com/android/modules/apkinapex/Android.bp
@@ -21,7 +21,7 @@ package {
 java_test_host {
     name: "ApkInApexTest",
     srcs: [
-        "ApkInApexTest.java"
+        "ApkInApexTest.java",
     ],
     libs: ["tradefed"],
     java_resources: [
@@ -32,7 +32,7 @@ java_test_host {
         "cts-install-lib-host",
         "frameworks-base-hostutils",
         "modules-utils-build-testing",
-        "truth-prebuilt",
+        "truth",
     ],
     test_suites: [
         "general-tests",
diff --git a/javatests/com/android/modules/conformanceframework/Android.bp b/javatests/com/android/modules/conformanceframework/Android.bp
index 60ad0d13..287daa6a 100644
--- a/javatests/com/android/modules/conformanceframework/Android.bp
+++ b/javatests/com/android/modules/conformanceframework/Android.bp
@@ -24,7 +24,7 @@ java_test_host {
     static_libs: [
         "junit",
         "ClasspathFetcher",
-        "truth-prebuilt",
+        "truth",
         "objenesis",
     ],
     libs: [
diff --git a/javatests/com/android/modules/targetprep/Android.bp b/javatests/com/android/modules/targetprep/Android.bp
index baa02190..1dd89150 100644
--- a/javatests/com/android/modules/targetprep/Android.bp
+++ b/javatests/com/android/modules/targetprep/Android.bp
@@ -24,13 +24,13 @@ java_test_host {
         unit_test: true,
     },
     srcs: [
-        "ClasspathFetcherTest.java"
+        "ClasspathFetcherTest.java",
     ],
     static_libs: [
         "ClasspathFetcher",
         "mockito-host",
         "objenesis",
-        "truth-prebuilt",
+        "truth",
         "junit",
         "tradefed",
     ],
diff --git a/javatests/com/android/modules/updatablesharedlibs/Android.bp b/javatests/com/android/modules/updatablesharedlibs/Android.bp
index e3074e5e..9813dc85 100644
--- a/javatests/com/android/modules/updatablesharedlibs/Android.bp
+++ b/javatests/com/android/modules/updatablesharedlibs/Android.bp
@@ -21,7 +21,7 @@ package {
 java_test_host {
     name: "UpdatableSharedLibsTest",
     srcs: [
-        "UpdatableSharedLibsTest.java"
+        "UpdatableSharedLibsTest.java",
     ],
     libs: ["tradefed"],
     java_resources: [
@@ -37,7 +37,7 @@ java_test_host {
         "cts-install-lib-host",
         "frameworks-base-hostutils",
         "modules-utils-build-testing",
-        "truth-prebuilt",
+        "truth",
     ],
     test_suites: [
         "general-tests",
diff --git a/javatests/com/android/modules/updatablesharedlibs/apps/targetS/Android.bp b/javatests/com/android/modules/updatablesharedlibs/apps/targetS/Android.bp
index c714267c..58dc54bd 100644
--- a/javatests/com/android/modules/updatablesharedlibs/apps/targetS/Android.bp
+++ b/javatests/com/android/modules/updatablesharedlibs/apps/targetS/Android.bp
@@ -23,7 +23,7 @@ android_test_helper_app {
     static_libs: [
         "androidx.test.rules",
         "androidx.test.core",
-        "truth-prebuilt",
+        "truth",
     ],
     sdk_version: "current",
     min_sdk_version: "31",
diff --git a/javatests/com/android/modules/updatablesharedlibs/apps/targetT/Android.bp b/javatests/com/android/modules/updatablesharedlibs/apps/targetT/Android.bp
index 2649a95c..90c12307 100644
--- a/javatests/com/android/modules/updatablesharedlibs/apps/targetT/Android.bp
+++ b/javatests/com/android/modules/updatablesharedlibs/apps/targetT/Android.bp
@@ -22,7 +22,7 @@ android_test_helper_app {
     static_libs: [
         "androidx.test.rules",
         "androidx.test.core",
-        "truth-prebuilt",
+        "truth",
     ],
     sdk_version: "current",
     min_sdk_version: "Tiramisu",
diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp
index f3a24578..2ee0d955 100644
--- a/sdk/ModuleDefaults.bp
+++ b/sdk/ModuleDefaults.bp
@@ -17,39 +17,6 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-mainline_stubs_args =
-    "--error UnhiddenSystemApi " +
-    "--hide CallbackInterface " +
-    "--hide HiddenTypedefConstant " +
-    "--hide RequiresPermission " +
-    "--enhance-documentation "
-
-// TODO: remove the hiding when server classes are cleaned up.
-mainline_framework_stubs_args =
-    mainline_stubs_args +
-    "--hide-package com.android.server "
-
-priv_apps = " " +
-    "--show-annotation android.annotation.SystemApi\\(" +
-        "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
-    "\\) "
-
-module_libs = " " +
-    " --show-annotation android.annotation.SystemApi\\(" +
-        "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +
-    "\\)" +
-    " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" +
-        "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
-    "\\) "
-
-mainline_service_stubs_args =
-    mainline_stubs_args +
-    "--show-annotation android.annotation.SystemApi\\(" +
-        "client=android.annotation.SystemApi.Client.SYSTEM_SERVER" +
-    "\\) " +
-    "--hide-annotation android.annotation.Hide " +
-    "--hide InternalClasses " // com.android.* classes are okay in this interface
-
 // Defaults common to all mainline module java_sdk_library instances.
 java_defaults {
     name: "framework-module-common-defaults",
@@ -91,7 +58,13 @@ java_defaults {
     installable: false,
 
     // Configure framework module specific metalava options.
-    droiddoc_options: [mainline_stubs_args],
+    droiddoc_options: [
+        "--error UnhiddenSystemApi",
+        "--hide CallbackInterface",
+        "--hide HiddenTypedefConstant",
+        "--hide RequiresPermission",
+        "--enhance-documentation",
+    ],
 
     annotations_enabled: true,
 
@@ -133,6 +106,8 @@ java_defaults {
     },
 
     defaults_visibility: [
+        "//frameworks/base",
+        "//frameworks/base/api",
         "//packages/modules/Virtualization:__subpackages__",
     ],
 }
@@ -159,6 +134,8 @@ java_defaults {
 
     defaults_visibility: [
         ":__subpackages__",
+        // TODO(b/237461653): Move this to packages/modules/Nfc
+        "//frameworks/base/core/java",
         "//frameworks/base/apex:__subpackages__",
         "//frameworks/base/libs/hwui",
         "//frameworks/base/wifi",
@@ -193,40 +170,6 @@ java_defaults {
     ],
 }
 
-stubs_defaults {
-    name: "service-module-stubs-srcs-defaults",
-    args: mainline_service_stubs_args,
-    installable: false,
-    annotations_enabled: true,
-    merge_annotations_dirs: [
-        "metalava-manual",
-    ],
-    filter_packages: ["com.android."],
-    check_api: {
-        current: {
-            api_file: "api/current.txt",
-            removed_api_file: "api/removed.txt",
-        },
-        api_lint: {
-            enabled: true,
-        },
-    },
-    dist: {
-        targets: ["sdk"],
-        dir: "apistubs/android/system-server/api",
-    },
-}
-
-// Empty for now, but a convenient place to add rules for all
-// module java_library system_server stub libs.
-java_defaults {
-    name: "service-module-stubs-defaults",
-    dist: {
-        targets: ["sdk"],
-        dir: "apistubs/android/system-server",
-    },
-}
-
 filegroup_defaults {
     name: "framework-sources-module-defaults",
     visibility: [
@@ -355,7 +298,7 @@ apex_defaults {
 library_linking_strategy_cc_defaults {
     name: "apex-lowest-min-sdk-version",
     defaults_visibility: [
-         "//system/core/libutils",
+         "//system/core/libutils:__subpackages__",
     ],
     min_sdk_version: APEX_LOWEST_MIN_SDK_VERSION,
     soong_config_variables: {