Snap for 11671125 from 5a37b32258459c8d6100cbe200c654287ea4c880 to mainline-art-release

Change-Id: I9aaadd8632bc832d72d0bee4b365c76dfe98f92d
diff --git a/Android.bp b/Android.bp
index 0c634f6..8e5dbcb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// This file is automatically generated by gn2bp/gen_android_bp. Do not edit.
+// This file is automatically generated by gen_android_bp. Do not edit.
 
 build = ["Android.extras.bp"]
 
@@ -125,8 +125,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_PARTITION_ALLOC_BASE_IMPL",
@@ -134,9 +134,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -243,8 +244,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DIS_PARTITION_ALLOC_BASE_IMPL",
         "-DNDEBUG",
@@ -253,7 +254,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -292,6 +293,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -308,6 +310,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -325,6 +328,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -340,6 +344,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -356,6 +361,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -435,8 +441,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAS_PR_MTE_MACROS",
         "-DHAVE_SYS_UIO_H",
@@ -445,9 +451,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -562,8 +569,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DIS_PARTITION_ALLOC_IMPL",
         "-DNDEBUG",
@@ -572,7 +579,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -605,6 +612,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -618,6 +626,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-march=armv8-a+memtag",
@@ -633,6 +642,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
             local_include_dirs: [
@@ -645,6 +655,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -658,6 +669,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -711,18 +723,19 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
-        "-DIS_PARTITION_ALLOC_IMPL",
+        "-DIS_ALLOCATOR_SHIM_IMPL",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -823,17 +836,17 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
-        "-DIS_PARTITION_ALLOC_IMPL",
+        "-DIS_ALLOCATOR_SHIM_IMPL",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -868,6 +881,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -897,6 +911,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -927,6 +942,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
             ldflags: [
@@ -955,6 +971,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -984,6 +1001,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -1042,6 +1060,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/chromecast_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1066,6 +1087,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/chromecast_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1089,6 +1113,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/chromeos_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1113,6 +1140,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/chromeos_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1187,6 +1217,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/debugging_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1274,6 +1307,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/debugging_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1282,327 +1318,6 @@
     ],
 }
 
-// GN: //base/allocator/partition_allocator/src/partition_alloc:partition_alloc
-cc_library_static {
-    name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc",
-    generated_headers: [
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
-    ],
-    export_generated_headers: [
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DANDROID",
-        "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
-        "-DHAVE_SYS_UIO_H",
-        "-DNDEBUG",
-        "-DNO_UNWIND_TABLES",
-        "-DNVALGRIND",
-        "-DOFFICIAL_BUILD",
-        "-D_GNU_SOURCE",
-        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
-        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D__STDC_CONSTANT_MACROS",
-        "-D__STDC_FORMAT_MACROS",
-        "-Oz",
-        "-fdata-sections",
-        "-ffunction-sections",
-        "-fno-asynchronous-unwind-tables",
-        "-fno-unwind-tables",
-        "-fvisibility-inlines-hidden",
-        "-fvisibility=hidden",
-        "-g1",
-    ],
-    local_include_dirs: [
-        "./",
-        "base/allocator/partition_allocator/src/",
-        "buildtools/third_party/libc++/",
-        "third_party/libc++/src/include",
-        "third_party/libc++abi/src/include",
-    ],
-    cpp_std: "c++20",
-    ldflags: [
-        "-Wl,--as-needed",
-        "-Wl,--gc-sections",
-        "-Wl,--icf=all",
-        "-Wl,-wrap,asprintf",
-        "-Wl,-wrap,calloc",
-        "-Wl,-wrap,free",
-        "-Wl,-wrap,getcwd",
-        "-Wl,-wrap,malloc",
-        "-Wl,-wrap,malloc_usable_size",
-        "-Wl,-wrap,memalign",
-        "-Wl,-wrap,posix_memalign",
-        "-Wl,-wrap,pvalloc",
-        "-Wl,-wrap,realloc",
-        "-Wl,-wrap,realpath",
-        "-Wl,-wrap,strdup",
-        "-Wl,-wrap,strndup",
-        "-Wl,-wrap,valloc",
-        "-Wl,-wrap,vasprintf",
-    ],
-    target: {
-        android_arm: {
-            cflags: [
-                "-D_FORTIFY_SOURCE=2",
-                "-fstack-protector",
-            ],
-        },
-        android_arm64: {
-            cflags: [
-                "-D_FORTIFY_SOURCE=2",
-                "-fstack-protector",
-                "-mno-outline",
-            ],
-        },
-        android_riscv64: {
-            cflags: [
-                "-fstack-protector",
-            ],
-        },
-        android_x86: {
-            cflags: [
-                "-D_FORTIFY_SOURCE=2",
-                "-msse3",
-            ],
-        },
-        android_x86_64: {
-            cflags: [
-                "-D_FORTIFY_SOURCE=2",
-                "-fstack-protector",
-                "-msse3",
-            ],
-        },
-    },
-}
-
-// GN: //base/allocator/partition_allocator/src/partition_alloc:partition_alloc__testing
-cc_library_static {
-    name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
-    host_supported: true,
-    generated_headers: [
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags__testing",
-    ],
-    export_generated_headers: [
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags__testing",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
-        "-DNDEBUG",
-        "-DNO_UNWIND_TABLES",
-        "-DNVALGRIND",
-        "-DOFFICIAL_BUILD",
-        "-D_GNU_SOURCE",
-        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
-        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D__STDC_CONSTANT_MACROS",
-        "-D__STDC_FORMAT_MACROS",
-        "-fdata-sections",
-        "-ffunction-sections",
-        "-fno-asynchronous-unwind-tables",
-        "-fno-unwind-tables",
-        "-fvisibility-inlines-hidden",
-        "-fvisibility=hidden",
-        "-g1",
-    ],
-    local_include_dirs: [
-        "./",
-        "base/allocator/partition_allocator/src/",
-        "buildtools/third_party/libc++/",
-        "third_party/libc++/src/include",
-        "third_party/libc++abi/src/include",
-    ],
-    cpp_std: "c++20",
-    ldflags: [
-        "-Wl,--as-needed",
-        "-Wl,--gc-sections",
-        "-Wl,--icf=all",
-    ],
-    target: {
-        android_arm: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-D_FORTIFY_SOURCE=2",
-                "-Oz",
-                "-fstack-protector",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        android_arm64: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-D_FORTIFY_SOURCE=2",
-                "-Oz",
-                "-fstack-protector",
-                "-mno-outline",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        android_riscv64: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-Oz",
-                "-fstack-protector",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        android_x86: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-D_FORTIFY_SOURCE=2",
-                "-Oz",
-                "-msse3",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        android_x86_64: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-D_FORTIFY_SOURCE=2",
-                "-Oz",
-                "-fstack-protector",
-                "-msse3",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        host: {
-            cflags: [
-                "-DCR_SYSROOT_KEY=20230611T210420Z-2",
-                "-DUSE_AURA=1",
-                "-DUSE_OZONE=1",
-                "-DUSE_UDEV",
-                "-D_FILE_OFFSET_BITS=64",
-                "-D_FORTIFY_SOURCE=2",
-                "-D_LARGEFILE64_SOURCE",
-                "-D_LARGEFILE_SOURCE",
-                "-O2",
-                "-fstack-protector",
-                "-msse3",
-            ],
-            compile_multilib: "64",
-        },
-    },
-}
-
 // GN: //base/allocator/partition_allocator/src/partition_alloc:partition_alloc_buildflags
 cc_genrule {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
@@ -1669,6 +1384,10 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_buildflags.h",
     ],
+    export_include_dirs: [
+        ".",
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1756,6 +1475,10 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_buildflags.h",
     ],
+    export_include_dirs: [
+        ".",
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1767,6 +1490,9 @@
 // GN: //base/allocator/partition_allocator/src/partition_alloc:raw_ptr
 cc_library_static {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr",
+    srcs: [
+        "base/allocator/partition_allocator/src/partition_alloc/pointers/empty.cc",
+    ],
     generated_headers: [
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags",
@@ -1787,8 +1513,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_RAW_PTR_IMPL",
@@ -1796,9 +1522,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -1862,6 +1589,9 @@
 // GN: //base/allocator/partition_allocator/src/partition_alloc:raw_ptr__testing
 cc_library_static {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
+    srcs: [
+        "base/allocator/partition_allocator/src/partition_alloc/pointers/empty.cc",
+    ],
     host_supported: true,
     generated_headers: [
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags__testing",
@@ -1881,8 +1611,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DIS_RAW_PTR_IMPL",
         "-DNDEBUG",
@@ -1891,7 +1621,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -1923,6 +1653,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -1932,6 +1663,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -1942,6 +1674,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -1950,6 +1683,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -1959,6 +1693,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -1997,6 +1732,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/raw_ptr_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -2021,6 +1759,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/raw_ptr_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -2190,9 +1931,9 @@
     ],
 }
 
-// GN: //base:android_runtime_jni_headers
+// GN: //base:android_runtime_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_base_android_runtime_jni_headers",
+    name: "cronet_aml_base_android_runtime_jni_headers__action",
     tools: [
         ":javap",
     ],
@@ -2235,9 +1976,9 @@
     ],
 }
 
-// GN: //base:android_runtime_jni_headers__testing
+// GN: //base:android_runtime_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_base_android_runtime_jni_headers__testing",
+    name: "cronet_aml_base_android_runtime_jni_headers__action__testing",
     tools: [
         ":javap",
     ],
@@ -2280,9 +2021,9 @@
     ],
 }
 
-// GN: //base:android_runtime_unchecked_jni_headers
+// GN: //base:android_runtime_unchecked_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_base_android_runtime_unchecked_jni_headers",
+    name: "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
     tools: [
         ":javap",
     ],
@@ -2321,9 +2062,9 @@
     ],
 }
 
-// GN: //base:android_runtime_unchecked_jni_headers__testing
+// GN: //base:android_runtime_unchecked_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
+    name: "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
     tools: [
         ":javap",
     ],
@@ -2441,7 +2182,6 @@
         "base/check_is_test.cc",
         "base/check_op.cc",
         "base/command_line.cc",
-        "base/containers/flat_tree.cc",
         "base/containers/intrusive_heap.cc",
         "base/containers/linked_list.cc",
         "base/cpu.cc",
@@ -2642,6 +2382,7 @@
         "base/strings/abseil_string_number_conversions.cc",
         "base/strings/escape.cc",
         "base/strings/latin1_string_conversions.cc",
+        "base/strings/levenshtein_distance.cc",
         "base/strings/pattern.cc",
         "base/strings/safe_sprintf.cc",
         "base/strings/strcat.cc",
@@ -2720,6 +2461,7 @@
         "base/task/thread_pool/environment_config.cc",
         "base/task/thread_pool/initialization_util.cc",
         "base/task/thread_pool/job_task_source.cc",
+        "base/task/thread_pool/job_task_source_old.cc",
         "base/task/thread_pool/pooled_parallel_task_runner.cc",
         "base/task/thread_pool/pooled_sequenced_task_runner.cc",
         "base/task/thread_pool/pooled_single_thread_task_runner_manager.cc",
@@ -2738,6 +2480,7 @@
         "base/task/thread_pool/thread_pool_instance.cc",
         "base/task/thread_pool/worker_thread.cc",
         "base/task/thread_pool/worker_thread_set.cc",
+        "base/task/thread_pool/worker_thread_waitable_event.cc",
         "base/third_party/cityhash/city.cc",
         "base/third_party/cityhash_v103/src/city_v103.cc",
         "base/third_party/nspr/prtime.cc",
@@ -2796,6 +2539,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -2808,21 +2552,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -2842,21 +2587,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -2878,8 +2624,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBASE_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -2888,6 +2634,8 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -2896,7 +2644,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -3021,7 +2769,6 @@
         "base/check_is_test.cc",
         "base/check_op.cc",
         "base/command_line.cc",
-        "base/containers/flat_tree.cc",
         "base/containers/intrusive_heap.cc",
         "base/containers/linked_list.cc",
         "base/cpu.cc",
@@ -3212,6 +2959,7 @@
         "base/strings/abseil_string_number_conversions.cc",
         "base/strings/escape.cc",
         "base/strings/latin1_string_conversions.cc",
+        "base/strings/levenshtein_distance.cc",
         "base/strings/pattern.cc",
         "base/strings/safe_sprintf.cc",
         "base/strings/strcat.cc",
@@ -3289,6 +3037,7 @@
         "base/task/thread_pool/environment_config.cc",
         "base/task/thread_pool/initialization_util.cc",
         "base/task/thread_pool/job_task_source.cc",
+        "base/task/thread_pool/job_task_source_old.cc",
         "base/task/thread_pool/pooled_parallel_task_runner.cc",
         "base/task/thread_pool/pooled_sequenced_task_runner.cc",
         "base/task/thread_pool/pooled_single_thread_task_runner_manager.cc",
@@ -3307,6 +3056,7 @@
         "base/task/thread_pool/thread_pool_instance.cc",
         "base/task/thread_pool/worker_thread.cc",
         "base/task/thread_pool/worker_thread_set.cc",
+        "base/task/thread_pool/worker_thread_waitable_event.cc",
         "base/third_party/cityhash/city.cc",
         "base/third_party/cityhash_v103/src/city_v103.cc",
         "base/third_party/nspr/prtime.cc",
@@ -3375,6 +3125,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -3404,6 +3155,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -3425,8 +3177,8 @@
     ],
     cflags: [
         "-DBASE_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
         "-DIS_RAW_PTR_IMPL",
@@ -3442,7 +3194,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -3558,10 +3310,15 @@
                 "base/time/time_android.cc",
                 "base/trace_event/cfi_backtrace_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -3569,13 +3326,13 @@
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -3672,10 +3429,15 @@
                 "base/threading/platform_thread_android.cc",
                 "base/time/time_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -3684,13 +3446,13 @@
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -3786,23 +3548,28 @@
                 "base/threading/platform_thread_android.cc",
                 "base/time/time_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-fstack-protector",
             ],
             local_include_dirs: [
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -3898,10 +3665,15 @@
                 "base/threading/platform_thread_android.cc",
                 "base/time/time_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -3909,13 +3681,13 @@
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -4011,10 +3783,15 @@
                 "base/threading/platform_thread_android.cc",
                 "base/time/time_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -4023,13 +3800,13 @@
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -4161,7 +3938,7 @@
     name: "cronet_aml_base_base_java",
     srcs: [
         ":cronet_aml_base_base_android_java_enums_srcjar",
-        ":cronet_aml_base_base_jni__java",
+        ":cronet_aml_base_base_jni__action__java",
         ":cronet_aml_base_java_features_srcjar",
         ":cronet_aml_base_java_switches_srcjar",
         "base/android/java/src/org/chromium/base/ActivityState.java",
@@ -4194,11 +3971,13 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LifetimeAssert.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/Log.java",
         "base/android/java/src/org/chromium/base/MathUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
+        "base/android/java/src/org/chromium/base/MutableFlagWithSafeDefault.java",
         "base/android/java/src/org/chromium/base/ObserverList.java",
         "base/android/java/src/org/chromium/base/PackageManagerUtils.java",
         "base/android/java/src/org/chromium/base/PackageUtils.java",
@@ -4281,6 +4060,7 @@
         "base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java",
         "base/android/java/src/org/chromium/base/supplier/Supplier.java",
+        "base/android/java/src/org/chromium/base/supplier/SupplierUtils.java",
         "base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java",
         "base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java",
@@ -4303,7 +4083,6 @@
         "base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java",
     ],
     static_libs: [
-        "cronet_aml_base_jni_java",
         "cronet_aml_build_android_build_java",
         "cronet_aml_third_party_jni_zero_jni_zero_java",
     ],
@@ -4326,7 +4105,7 @@
     name: "cronet_aml_base_base_java__testing",
     srcs: [
         ":cronet_aml_base_base_android_java_enums_srcjar__testing",
-        ":cronet_aml_base_base_jni__testing__java",
+        ":cronet_aml_base_base_jni__action__testing__java",
         ":cronet_aml_base_java_features_srcjar__testing",
         ":cronet_aml_base_java_switches_srcjar__testing",
         "base/android/java/src/org/chromium/base/ActivityState.java",
@@ -4359,11 +4138,13 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LifetimeAssert.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/Log.java",
         "base/android/java/src/org/chromium/base/MathUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
+        "base/android/java/src/org/chromium/base/MutableFlagWithSafeDefault.java",
         "base/android/java/src/org/chromium/base/ObserverList.java",
         "base/android/java/src/org/chromium/base/PackageManagerUtils.java",
         "base/android/java/src/org/chromium/base/PackageUtils.java",
@@ -4446,6 +4227,7 @@
         "base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java",
         "base/android/java/src/org/chromium/base/supplier/Supplier.java",
+        "base/android/java/src/org/chromium/base/supplier/SupplierUtils.java",
         "base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java",
         "base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java",
@@ -4468,7 +4250,6 @@
         "base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java",
     ],
     static_libs: [
-        "cronet_aml_base_jni_java__testing",
         "cronet_aml_build_android_build_java__testing",
         "cronet_aml_third_party_jni_zero_jni_zero_java__testing",
     ],
@@ -4616,9 +4397,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //base:base_jni
+// GN: //base:base_jni__action
 cc_genrule {
-    name: "cronet_aml_base_base_jni",
+    name: "cronet_aml_base_base_jni__action",
     srcs: [
         "base/android/java/src/org/chromium/base/ApkAssets.java",
         "base/android/java/src/org/chromium/base/ApplicationStatus.java",
@@ -4641,11 +4422,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -4715,6 +4496,8 @@
          "--output-name " +
          "JavaHandlerThread_jni.h " +
          "--output-name " +
+         "JniAndroid_jni.h " +
+         "--output-name " +
          "LocaleUtils_jni.h " +
          "--output-name " +
          "MemoryPressureListener_jni.h " +
@@ -4723,8 +4506,6 @@
          "--output-name " +
          "PathUtils_jni.h " +
          "--output-name " +
-         "PiiElider_jni.h " +
-         "--output-name " +
          "PowerMonitor_jni.h " +
          "--output-name " +
          "RadioUtils_jni.h " +
@@ -4799,6 +4580,8 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/JavaHandlerThread.java) " +
          "--input-file " +
+         "$(location base/android/java/src/org/chromium/base/JniAndroid.java) " +
+         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/LocaleUtils.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/MemoryPressureListener.java) " +
@@ -4807,8 +4590,6 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PathUtils.java) " +
          "--input-file " +
-         "$(location base/android/java/src/org/chromium/base/PiiElider.java) " +
-         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PowerMonitor.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/RadioUtils.java) " +
@@ -4867,6 +4648,7 @@
         "base/base_jni/JavaExceptionReporter_jni.h",
         "base/base_jni/JavaHandlerThread_jni.h",
         "base/base_jni/JavaHeapDumpGenerator_jni.h",
+        "base/base_jni/JniAndroid_jni.h",
         "base/base_jni/LibraryLoader_jni.h",
         "base/base_jni/LibraryPrefetcher_jni.h",
         "base/base_jni/LocaleUtils_jni.h",
@@ -4875,7 +4657,6 @@
         "base/base_jni/NativeUmaRecorder_jni.h",
         "base/base_jni/PathService_jni.h",
         "base/base_jni/PathUtils_jni.h",
-        "base/base_jni/PiiElider_jni.h",
         "base/base_jni/PostTask_jni.h",
         "base/base_jni/PowerMonitor_jni.h",
         "base/base_jni/RadioUtils_jni.h",
@@ -4904,9 +4685,9 @@
     ],
 }
 
-// GN: //base:base_jni
+// GN: //base:base_jni__action
 java_genrule {
-    name: "cronet_aml_base_base_jni__java",
+    name: "cronet_aml_base_base_jni__action__java",
     srcs: [
         "base/android/java/src/org/chromium/base/ApkAssets.java",
         "base/android/java/src/org/chromium/base/ApplicationStatus.java",
@@ -4929,11 +4710,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -5003,6 +4784,8 @@
          "--output-name " +
          "JavaHandlerThread_jni.h " +
          "--output-name " +
+         "JniAndroid_jni.h " +
+         "--output-name " +
          "LocaleUtils_jni.h " +
          "--output-name " +
          "MemoryPressureListener_jni.h " +
@@ -5011,8 +4794,6 @@
          "--output-name " +
          "PathUtils_jni.h " +
          "--output-name " +
-         "PiiElider_jni.h " +
-         "--output-name " +
          "PowerMonitor_jni.h " +
          "--output-name " +
          "RadioUtils_jni.h " +
@@ -5087,6 +4868,8 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/JavaHandlerThread.java) " +
          "--input-file " +
+         "$(location base/android/java/src/org/chromium/base/JniAndroid.java) " +
+         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/LocaleUtils.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/MemoryPressureListener.java) " +
@@ -5095,8 +4878,6 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PathUtils.java) " +
          "--input-file " +
-         "$(location base/android/java/src/org/chromium/base/PiiElider.java) " +
-         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PowerMonitor.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/RadioUtils.java) " +
@@ -5155,6 +4936,7 @@
         "base/base_jni/JavaExceptionReporter_jni.h",
         "base/base_jni/JavaHandlerThread_jni.h",
         "base/base_jni/JavaHeapDumpGenerator_jni.h",
+        "base/base_jni/JniAndroid_jni.h",
         "base/base_jni/LibraryLoader_jni.h",
         "base/base_jni/LibraryPrefetcher_jni.h",
         "base/base_jni/LocaleUtils_jni.h",
@@ -5163,7 +4945,6 @@
         "base/base_jni/NativeUmaRecorder_jni.h",
         "base/base_jni/PathService_jni.h",
         "base/base_jni/PathUtils_jni.h",
-        "base/base_jni/PiiElider_jni.h",
         "base/base_jni/PostTask_jni.h",
         "base/base_jni/PowerMonitor_jni.h",
         "base/base_jni/RadioUtils_jni.h",
@@ -5189,9 +4970,9 @@
     ],
 }
 
-// GN: //base:base_jni__testing
+// GN: //base:base_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_base_base_jni__testing",
+    name: "cronet_aml_base_base_jni__action__testing",
     srcs: [
         "base/android/java/src/org/chromium/base/ApkAssets.java",
         "base/android/java/src/org/chromium/base/ApplicationStatus.java",
@@ -5214,11 +4995,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -5288,6 +5069,8 @@
          "--output-name " +
          "JavaHandlerThread_jni.h " +
          "--output-name " +
+         "JniAndroid_jni.h " +
+         "--output-name " +
          "LocaleUtils_jni.h " +
          "--output-name " +
          "MemoryPressureListener_jni.h " +
@@ -5296,8 +5079,6 @@
          "--output-name " +
          "PathUtils_jni.h " +
          "--output-name " +
-         "PiiElider_jni.h " +
-         "--output-name " +
          "PowerMonitor_jni.h " +
          "--output-name " +
          "RadioUtils_jni.h " +
@@ -5372,6 +5153,8 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/JavaHandlerThread.java) " +
          "--input-file " +
+         "$(location base/android/java/src/org/chromium/base/JniAndroid.java) " +
+         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/LocaleUtils.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/MemoryPressureListener.java) " +
@@ -5380,8 +5163,6 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PathUtils.java) " +
          "--input-file " +
-         "$(location base/android/java/src/org/chromium/base/PiiElider.java) " +
-         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PowerMonitor.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/RadioUtils.java) " +
@@ -5438,6 +5219,7 @@
         "base/base_jni/JavaExceptionReporter_jni.h",
         "base/base_jni/JavaHandlerThread_jni.h",
         "base/base_jni/JavaHeapDumpGenerator_jni.h",
+        "base/base_jni/JniAndroid_jni.h",
         "base/base_jni/LibraryLoader_jni.h",
         "base/base_jni/LibraryPrefetcher_jni.h",
         "base/base_jni/LocaleUtils_jni.h",
@@ -5446,7 +5228,6 @@
         "base/base_jni/NativeUmaRecorder_jni.h",
         "base/base_jni/PathService_jni.h",
         "base/base_jni/PathUtils_jni.h",
-        "base/base_jni/PiiElider_jni.h",
         "base/base_jni/PostTask_jni.h",
         "base/base_jni/PowerMonitor_jni.h",
         "base/base_jni/RadioUtils_jni.h",
@@ -5475,9 +5256,9 @@
     ],
 }
 
-// GN: //base:base_jni__testing
+// GN: //base:base_jni__action__testing
 java_genrule {
-    name: "cronet_aml_base_base_jni__testing__java",
+    name: "cronet_aml_base_base_jni__action__testing__java",
     srcs: [
         "base/android/java/src/org/chromium/base/ApkAssets.java",
         "base/android/java/src/org/chromium/base/ApplicationStatus.java",
@@ -5500,11 +5281,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -5574,6 +5355,8 @@
          "--output-name " +
          "JavaHandlerThread_jni.h " +
          "--output-name " +
+         "JniAndroid_jni.h " +
+         "--output-name " +
          "LocaleUtils_jni.h " +
          "--output-name " +
          "MemoryPressureListener_jni.h " +
@@ -5582,8 +5365,6 @@
          "--output-name " +
          "PathUtils_jni.h " +
          "--output-name " +
-         "PiiElider_jni.h " +
-         "--output-name " +
          "PowerMonitor_jni.h " +
          "--output-name " +
          "RadioUtils_jni.h " +
@@ -5658,6 +5439,8 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/JavaHandlerThread.java) " +
          "--input-file " +
+         "$(location base/android/java/src/org/chromium/base/JniAndroid.java) " +
+         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/LocaleUtils.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/MemoryPressureListener.java) " +
@@ -5666,8 +5449,6 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PathUtils.java) " +
          "--input-file " +
-         "$(location base/android/java/src/org/chromium/base/PiiElider.java) " +
-         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PowerMonitor.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/RadioUtils.java) " +
@@ -5724,6 +5505,7 @@
         "base/base_jni/JavaExceptionReporter_jni.h",
         "base/base_jni/JavaHandlerThread_jni.h",
         "base/base_jni/JavaHeapDumpGenerator_jni.h",
+        "base/base_jni/JniAndroid_jni.h",
         "base/base_jni/LibraryLoader_jni.h",
         "base/base_jni/LibraryPrefetcher_jni.h",
         "base/base_jni/LocaleUtils_jni.h",
@@ -5732,7 +5514,6 @@
         "base/base_jni/NativeUmaRecorder_jni.h",
         "base/base_jni/PathService_jni.h",
         "base/base_jni/PathUtils_jni.h",
-        "base/base_jni/PiiElider_jni.h",
         "base/base_jni/PostTask_jni.h",
         "base/base_jni/PowerMonitor_jni.h",
         "base/base_jni/RadioUtils_jni.h",
@@ -5758,9 +5539,9 @@
     ],
 }
 
-// GN: //base:base_shared_preferences_jni
+// GN: //base:base_shared_preferences_jni__action
 cc_genrule {
-    name: "cronet_aml_base_base_shared_preferences_jni",
+    name: "cronet_aml_base_base_shared_preferences_jni__action",
     srcs: [
         "base/android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
     ],
@@ -5800,9 +5581,9 @@
     ],
 }
 
-// GN: //base:base_shared_preferences_jni__testing
+// GN: //base:base_shared_preferences_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_base_base_shared_preferences_jni__testing",
+    name: "cronet_aml_base_base_shared_preferences_jni__action__testing",
     srcs: [
         "base/android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
     ],
@@ -5847,9 +5628,11 @@
         "base/base_switches.cc",
     ],
     generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_build_chromeos_buildflags",
     ],
     export_generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_build_chromeos_buildflags",
     ],
     defaults: [
@@ -5858,17 +5641,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -5936,17 +5720,19 @@
     ],
     host_supported: true,
     generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
     ],
     export_generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -5954,7 +5740,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -5985,6 +5771,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -5994,6 +5781,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -6004,6 +5792,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -6012,6 +5801,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -6021,6 +5811,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -6048,7 +5839,7 @@
 cc_genrule {
     name: "cronet_aml_base_build_date",
     cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
-         "1707253023",
+         "1712072430",
     out: [
         "base/generated_build_date.h",
     ],
@@ -6064,7 +5855,7 @@
 cc_genrule {
     name: "cronet_aml_base_build_date__testing",
     cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
-         "1707253023",
+         "1712072430",
     host_supported: true,
     out: [
         "base/generated_build_date.h",
@@ -6379,6 +6170,53 @@
     ],
 }
 
+// GN: //base:fuzzing_buildflags
+cc_genrule {
+    name: "cronet_aml_base_fuzzing_buildflags",
+    cmd: "mkdir -p $(genDir)/base && echo '--flags USE_FUZZING_ENGINE=\"false\"' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:fuzzing_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
+    out: [
+        "base/fuzzing_buildflags.h",
+    ],
+    tool_files: [
+        "build/write_buildflag_header.py",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+// GN: //base:fuzzing_buildflags__testing
+cc_genrule {
+    name: "cronet_aml_base_fuzzing_buildflags__testing",
+    cmd: "mkdir -p $(genDir)/base && echo '--flags USE_FUZZING_ENGINE=\"false\"' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:fuzzing_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
+    host_supported: true,
+    out: [
+        "base/fuzzing_buildflags.h",
+    ],
+    tool_files: [
+        "build/write_buildflag_header.py",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
 // GN: //base:i18n__testing
 cc_library_static {
     name: "cronet_aml_base_i18n__testing",
@@ -6420,6 +6258,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -6449,6 +6288,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -6472,8 +6312,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBASE_I18N_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -6481,6 +6321,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -6489,7 +6330,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -6734,32 +6575,10 @@
     ],
 }
 
-// GN: //base:jni_java
-java_library {
-    name: "cronet_aml_base_jni_java",
-    apex_available: [
-        "com.android.tethering",
-    ],
-    min_sdk_version: "30",
-    sdk_version: "current",
-    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
-}
-
-// GN: //base:jni_java__testing
-java_library {
-    name: "cronet_aml_base_jni_java__testing",
-    apex_available: [
-        "com.android.tethering",
-    ],
-    min_sdk_version: "30",
-    sdk_version: "current",
-    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
-}
-
 // GN: //base:logging_buildflags
 cc_genrule {
     name: "cronet_aml_base_logging_buildflags",
-    cmd: "mkdir -p $(genDir)/base && echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\" USE_RUNTIME_VLOG=\"true\"' | " +
+    cmd: "mkdir -p $(genDir)/base && echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6782,7 +6601,7 @@
 // GN: //base:logging_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_logging_buildflags__testing",
-    cmd: "mkdir -p $(genDir)/base && echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\" USE_RUNTIME_VLOG=\"true\"' | " +
+    cmd: "mkdir -p $(genDir)/base && echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6857,9 +6676,11 @@
         "base/nodebug_assertion.cc",
     ],
     generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_build_chromeos_buildflags",
     ],
     export_generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_build_chromeos_buildflags",
     ],
     defaults: [
@@ -6869,17 +6690,18 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBASE_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -6947,9 +6769,11 @@
     ],
     host_supported: true,
     generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
     ],
     export_generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
     ],
     defaults: [
@@ -6957,8 +6781,8 @@
     ],
     cflags: [
         "-DBASE_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -6966,7 +6790,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -6996,6 +6820,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -7006,6 +6831,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -7017,6 +6843,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -7026,6 +6853,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -7036,6 +6864,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -7182,7 +7011,7 @@
 java_library {
     name: "cronet_aml_base_process_launcher_java__testing",
     srcs: [
-        ":cronet_aml_base_process_launcher_jni__testing__java",
+        ":cronet_aml_base_process_launcher_jni__action__testing__java",
         "base/android/java/src/org/chromium/base/process_launcher/BindService.java",
         "base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java",
         "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java",
@@ -7198,9 +7027,9 @@
     ],
     static_libs: [
         "cronet_aml_base_base_java__testing",
-        "cronet_aml_base_jni_java__testing",
         "cronet_aml_base_process_launcher_aidl__testing",
         "cronet_aml_build_android_build_java__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_java__testing",
     ],
     apex_available: [
         "com.android.tethering",
@@ -7217,9 +7046,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //base:process_launcher_jni
+// GN: //base:process_launcher_jni__action
 cc_genrule {
-    name: "cronet_aml_base_process_launcher_jni",
+    name: "cronet_aml_base_process_launcher_jni__action",
     srcs: [
         "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
     ],
@@ -7259,9 +7088,9 @@
     ],
 }
 
-// GN: //base:process_launcher_jni__testing
+// GN: //base:process_launcher_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_base_process_launcher_jni__testing",
+    name: "cronet_aml_base_process_launcher_jni__action__testing",
     srcs: [
         "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
     ],
@@ -7299,9 +7128,9 @@
     ],
 }
 
-// GN: //base:process_launcher_jni__testing
+// GN: //base:process_launcher_jni__action__testing
 java_genrule {
-    name: "cronet_aml_base_process_launcher_jni__testing__java",
+    name: "cronet_aml_base_process_launcher_jni__action__testing__java",
     srcs: [
         "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
     ],
@@ -7638,9 +7467,9 @@
     ],
 }
 
-// GN: //base/test:base_unittests_jni_headers__testing
+// GN: //base/test:base_unittests_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_base_test_base_unittests_jni_headers__testing",
+    name: "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
     srcs: [
         "base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java",
         "base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java",
@@ -7708,6 +7537,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -7737,6 +7567,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -7759,17 +7590,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -7940,6 +7772,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -7949,8 +7782,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -7971,6 +7804,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -7980,8 +7814,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -7996,8 +7830,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -8010,7 +7844,9 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -8019,7 +7855,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -8049,6 +7885,7 @@
         "third_party/libc++abi/src/include",
         "third_party/libxml/linux/include/",
         "third_party/libxml/src/include/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -8169,9 +8006,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //base/test:test_support_jni_headers__testing
+// GN: //base/test:test_support_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_base_test_test_support_jni_headers__testing",
+    name: "cronet_aml_base_test_test_support_jni_headers__action__testing",
     srcs: [
         "base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java",
         "base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
@@ -8252,17 +8089,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -8340,8 +8178,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -8349,7 +8187,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -8379,6 +8217,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -8389,6 +8228,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -8400,6 +8240,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -8409,6 +8250,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -8419,6 +8261,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -8456,17 +8299,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -8531,8 +8375,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -8540,7 +8384,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -8569,6 +8413,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -8577,6 +8422,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -8586,6 +8432,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -8594,6 +8441,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
         },
@@ -8602,6 +8450,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -9279,6 +9128,7 @@
         "third_party/libc++/src/src/atomic.cpp",
         "third_party/libc++/src/src/barrier.cpp",
         "third_party/libc++/src/src/bind.cpp",
+        "third_party/libc++/src/src/call_once.cpp",
         "third_party/libc++/src/src/charconv.cpp",
         "third_party/libc++/src/src/chrono.cpp",
         "third_party/libc++/src/src/condition_variable.cpp",
@@ -9327,8 +9177,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DLIBCXX_BUILDING_LIBCXXABI",
         "-DNDEBUG",
@@ -9338,7 +9188,7 @@
         "-D_GNU_SOURCE",
         "-D_LIBCPP_BUILDING_LIBRARY",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
@@ -9372,6 +9222,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9381,6 +9232,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -9391,6 +9243,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9400,6 +9253,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -9409,6 +9263,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -9445,6 +9300,7 @@
         "third_party/libc++/src/src/atomic.cpp",
         "third_party/libc++/src/src/barrier.cpp",
         "third_party/libc++/src/src/bind.cpp",
+        "third_party/libc++/src/src/call_once.cpp",
         "third_party/libc++/src/src/charconv.cpp",
         "third_party/libc++/src/src/chrono.cpp",
         "third_party/libc++/src/src/condition_variable.cpp",
@@ -9493,8 +9349,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DLIBCXX_BUILDING_LIBCXXABI",
         "-DNDEBUG",
@@ -9504,7 +9360,7 @@
         "-D_GNU_SOURCE",
         "-D_LIBCPP_BUILDING_LIBRARY",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
@@ -9538,6 +9394,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9547,6 +9404,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -9557,6 +9415,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9566,6 +9425,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -9575,6 +9435,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -9628,8 +9489,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DLIBCXXABI_SILENT_TERMINATE",
         "-DNDEBUG",
@@ -9639,7 +9500,7 @@
         "-D_GNU_SOURCE",
         "-D_LIBCPP_BUILDING_LIBRARY",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -9675,6 +9536,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9687,6 +9549,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -9701,6 +9564,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
                 "-DHAVE___CXA_THREAD_ATEXIT_IMPL",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9713,6 +9577,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -9725,6 +9590,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -9777,8 +9643,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DLIBCXXABI_SILENT_TERMINATE",
         "-DNDEBUG",
@@ -9788,7 +9654,7 @@
         "-D_GNU_SOURCE",
         "-D_LIBCPP_BUILDING_LIBRARY",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -9824,6 +9690,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9836,6 +9703,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -9850,6 +9718,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
                 "-DHAVE___CXA_THREAD_ATEXIT_IMPL",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9862,6 +9731,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -9874,6 +9744,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -10014,8 +9885,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10026,9 +9897,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -10111,8 +9983,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10123,9 +9995,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -10276,6 +10149,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -10285,7 +10159,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr",
         "cronet_aml_base_base",
         "cronet_aml_base_base_static",
@@ -10400,6 +10273,7 @@
         "cronet_aml_third_party_cpu_features_ndk_compat",
         "cronet_aml_third_party_icu_icui18n",
         "cronet_aml_third_party_icu_icuuc_private",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils",
         "cronet_aml_third_party_libevent_libevent",
         "cronet_aml_third_party_metrics_proto_metrics_proto",
         "cronet_aml_third_party_modp_b64_modp_b64",
@@ -10412,8 +10286,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10424,9 +10298,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -10474,7 +10349,7 @@
         "-Wl,-wrap,valloc",
         "-Wl,-wrap,vasprintf",
     ],
-    stem: "libmainlinecronet.121.0.6103.2",
+    stem: "libmainlinecronet.121.0.6167.71",
     visibility: [
         "//external/cronet:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
@@ -10537,7 +10412,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -10654,6 +10528,7 @@
         "cronet_aml_third_party_cpu_features_ndk_compat__testing",
         "cronet_aml_third_party_icu_icui18n__testing",
         "cronet_aml_third_party_icu_icuuc_private__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
         "cronet_aml_third_party_libevent_libevent__testing",
         "cronet_aml_third_party_metrics_proto_metrics_proto__testing",
         "cronet_aml_third_party_modp_b64_modp_b64__testing",
@@ -10666,8 +10541,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10678,9 +10553,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -10728,7 +10604,7 @@
         "-Wl,-wrap,valloc",
         "-Wl,-wrap,vasprintf",
     ],
-    stem: "libmainlinecronet.121.0.6103.2",
+    stem: "libmainlinecronet.121.0.6167.71",
     visibility: [
         "//external/cronet:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
@@ -10888,6 +10764,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -10901,21 +10778,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -10936,21 +10814,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -10969,8 +10848,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10981,9 +10860,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -11087,6 +10967,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -11117,6 +10998,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -11140,8 +11022,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -11152,9 +11034,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -11259,6 +11142,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -11268,8 +11152,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -11291,6 +11175,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -11300,8 +11185,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -11317,8 +11202,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -11335,6 +11220,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
@@ -11344,7 +11230,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -11373,6 +11259,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -11468,7 +11355,7 @@
         "androidx.annotation_annotation-nodeps",
         "androidx.core_core-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11476,59 +11363,16 @@
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_impl_all_java__testing",
     static_libs: [
-        "cronet_aml_components_cronet_android_cronet_impl_aosp_native_base_java__testing",
         "cronet_aml_components_cronet_android_cronet_impl_common_base_java__testing",
         "cronet_aml_components_cronet_android_cronet_impl_native_base_java__testing",
         "cronet_aml_components_cronet_android_cronet_impl_platform_base_java__testing",
+        "cronet_aml_components_cronet_android_httpengine_native_provider_base_java__testing",
     ],
     apex_available: [
         "com.android.tethering",
     ],
     min_sdk_version: "30",
-    sdk_version: "current",
-    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
-}
-
-// GN: //components/cronet/android:cronet_impl_aosp_native_base_java__testing
-java_library {
-    name: "cronet_aml_components_cronet_android_cronet_impl_aosp_native_base_java__testing",
-    srcs: [
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamBuilderWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidCallbackExceptionWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHeaderBlockWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineBuilderWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpExceptionWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidNetworkExceptionWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidQuicExceptionWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUploadDataSinkWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestBuilderWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlResponseInfoWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamCallbackWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionTranslationUtils.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/PlatformCronetProvider.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/UploadDataProviderWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestCallbackWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestStatusListenerWrapper.java",
-    ],
-    static_libs: [
-        "cronet_aml_base_base_java__testing",
-        "cronet_aml_build_android_build_java__testing",
-        "cronet_aml_components_cronet_android_cronet_api_java__testing",
-        "cronet_aml_components_cronet_android_cronet_impl_common_base_java__testing",
-        "cronet_aml_third_party_jni_zero_jni_zero_java__testing",
-    ],
-    apex_available: [
-        "com.android.tethering",
-    ],
-    min_sdk_version: "30",
-    libs: [
-        "androidx.annotation_annotation-nodeps",
-        "androidx.core_core-nodeps",
-    ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11559,9 +11403,14 @@
         "components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java",
         "components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/CronetLoggerImpl.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/ExperimentalOptions.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/RateLimiter.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/SizeBuckets.java",
     ],
     static_libs: [
         "cronet_aml_components_cronet_android_cronet_api_java",
+        "cronet_aml_components_cronet_android_cronet_stats_log_java",
         "cronet_aml_net_android_net_thread_stats_uid_java",
     ],
     apex_available: [
@@ -11571,7 +11420,7 @@
     libs: [
         "androidx.annotation_annotation-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11602,9 +11451,14 @@
         "components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java",
         "components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/CronetLoggerImpl.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/ExperimentalOptions.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/RateLimiter.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/SizeBuckets.java",
     ],
     static_libs: [
         "cronet_aml_components_cronet_android_cronet_api_java__testing",
+        "cronet_aml_components_cronet_android_cronet_stats_log_java__testing",
         "cronet_aml_net_android_net_thread_stats_uid_java__testing",
     ],
     apex_available: [
@@ -11614,7 +11468,7 @@
     libs: [
         "androidx.annotation_annotation-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11636,7 +11490,7 @@
     libs: [
         "androidx.annotation_annotation-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11644,7 +11498,7 @@
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_impl_native_base_java",
     srcs: [
-        ":cronet_aml_components_cronet_android_cronet_jni_headers__java",
+        ":cronet_aml_components_cronet_android_cronet_jni_headers__action__java",
         ":cronet_aml_components_cronet_android_net_idempotency_java",
         ":cronet_aml_components_cronet_android_net_request_priority_java",
         ":cronet_aml_components_cronet_android_network_quality_observation_source_java",
@@ -11686,7 +11540,7 @@
         "androidx.annotation_annotation-nodeps",
         "jsr305",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     visibility: [
         "//external/cronet:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
@@ -11698,7 +11552,7 @@
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_impl_native_base_java__testing",
     srcs: [
-        ":cronet_aml_components_cronet_android_cronet_jni_headers__testing__java",
+        ":cronet_aml_components_cronet_android_cronet_jni_headers__action__testing__java",
         ":cronet_aml_components_cronet_android_net_idempotency_java__testing",
         ":cronet_aml_components_cronet_android_net_request_priority_java__testing",
         ":cronet_aml_components_cronet_android_network_quality_observation_source_java__testing",
@@ -11740,7 +11594,7 @@
         "androidx.annotation_annotation-nodeps",
         "jsr305",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11768,7 +11622,7 @@
         "androidx.annotation_annotation-nodeps",
         "jsr305",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11776,7 +11630,7 @@
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_javatests__testing",
     srcs: [
-        ":cronet_aml_components_cronet_android_cronet_tests_jni_headers__testing__java",
+        ":cronet_aml_components_cronet_android_cronet_tests_jni_headers__action__testing__java",
         "components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java",
@@ -11812,6 +11666,10 @@
         "components/cronet/android/test/javatests/src/org/chromium/net/httpflags/ResolvedFlagsTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetManifestTest.java",
+        "components/cronet/android/test/javatests/src/org/chromium/net/telemetry/CronetLoggerImplTest.java",
+        "components/cronet/android/test/javatests/src/org/chromium/net/telemetry/ExperimentalOptionsTest.java",
+        "components/cronet/android/test/javatests/src/org/chromium/net/telemetry/RateLimiterTest.java",
+        "components/cronet/android/test/javatests/src/org/chromium/net/telemetry/SizeBucketsTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java",
@@ -11864,9 +11722,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //components/cronet/android:cronet_jni_headers
+// GN: //components/cronet/android:cronet_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_jni_headers",
+    name: "cronet_aml_components_cronet_android_cronet_jni_headers__action",
     srcs: [
         "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
         "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
@@ -11930,9 +11788,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_jni_headers
+// GN: //components/cronet/android:cronet_jni_headers__action
 java_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_jni_headers__java",
+    name: "cronet_aml_components_cronet_android_cronet_jni_headers__action__java",
     srcs: [
         "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
         "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
@@ -11993,9 +11851,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_jni_headers__testing
+// GN: //components/cronet/android:cronet_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_jni_headers__testing",
+    name: "cronet_aml_components_cronet_android_cronet_jni_headers__action__testing",
     srcs: [
         "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
         "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
@@ -12057,9 +11915,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_jni_headers__testing
+// GN: //components/cronet/android:cronet_jni_headers__action__testing
 java_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_jni_headers__testing__java",
+    name: "cronet_aml_components_cronet_android_cronet_jni_headers__action__testing__java",
     srcs: [
         "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
         "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
@@ -12143,11 +12001,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -12248,11 +12106,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -12349,11 +12207,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -12452,11 +12310,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -12601,6 +12459,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -12615,21 +12474,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -12642,24 +12502,24 @@
         "cronet_aml_build_config_compiler_compiler_buildflags",
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_components_cronet_android_base_feature_overrides_proto_gen_headers",
-        "cronet_aml_components_cronet_android_cronet_jni_headers",
+        "cronet_aml_components_cronet_android_cronet_jni_headers__action",
         "cronet_aml_components_cronet_android_cronet_jni_registration",
         "cronet_aml_components_cronet_android_request_context_config_proto_gen_headers",
         "cronet_aml_components_cronet_cronet_buildflags",
         "cronet_aml_components_cronet_cronet_version_header_action",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
         "cronet_aml_crypto_buildflags",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -12669,21 +12529,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -12696,24 +12557,24 @@
         "cronet_aml_build_config_compiler_compiler_buildflags",
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_components_cronet_android_base_feature_overrides_proto_gen_headers",
-        "cronet_aml_components_cronet_android_cronet_jni_headers",
+        "cronet_aml_components_cronet_android_cronet_jni_headers__action",
         "cronet_aml_components_cronet_android_cronet_jni_registration",
         "cronet_aml_components_cronet_android_request_context_config_proto_gen_headers",
         "cronet_aml_components_cronet_cronet_buildflags",
         "cronet_aml_components_cronet_cronet_version_header_action",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
         "cronet_aml_crypto_buildflags",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -12721,8 +12582,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -12733,9 +12594,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -12849,6 +12712,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -12866,24 +12730,24 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_android_base_feature_overrides_proto_gen__testing_headers",
-        "cronet_aml_components_cronet_android_cronet_jni_headers__testing",
+        "cronet_aml_components_cronet_android_cronet_jni_headers__action__testing",
         "cronet_aml_components_cronet_android_cronet_jni_registration__testing",
         "cronet_aml_components_cronet_android_request_context_config_proto_gen__testing_headers",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -12898,6 +12762,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -12915,24 +12780,24 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_android_base_feature_overrides_proto_gen__testing_headers",
-        "cronet_aml_components_cronet_android_cronet_jni_headers__testing",
+        "cronet_aml_components_cronet_android_cronet_jni_headers__action__testing",
         "cronet_aml_components_cronet_android_cronet_jni_registration__testing",
         "cronet_aml_components_cronet_android_request_context_config_proto_gen__testing_headers",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -12940,8 +12805,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -12952,9 +12817,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -13037,11 +12904,45 @@
     },
 }
 
+// GN: //components/cronet/android:cronet_stats_log_java
+java_library {
+    name: "cronet_aml_components_cronet_android_cronet_stats_log_java",
+    srcs: [
+        "components/cronet/android/java/src/org/chromium/net/telemetry/CronetStatsLog.java",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+    min_sdk_version: "30",
+    libs: [
+        "androidx.annotation_annotation-nodeps",
+    ],
+    sdk_version: "system_current",
+    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
+}
+
+// GN: //components/cronet/android:cronet_stats_log_java__testing
+java_library {
+    name: "cronet_aml_components_cronet_android_cronet_stats_log_java__testing",
+    srcs: [
+        "components/cronet/android/java/src/org/chromium/net/telemetry/CronetStatsLog.java",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+    min_sdk_version: "30",
+    libs: [
+        "androidx.annotation_annotation-nodeps",
+    ],
+    sdk_version: "system_current",
+    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
+}
+
 // GN: //components/cronet/android:cronet_test_apk_java__testing
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_test_apk_java__testing",
     srcs: [
-        ":cronet_aml_components_cronet_android_cronet_test_apk_jni__testing__java",
+        ":cronet_aml_components_cronet_android_cronet_test_apk_jni__action__testing__java",
         "components/cronet/android/test/src/org/chromium/net/CronetTestApplication.java",
         "components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java",
         "components/cronet/android/test/src/org/chromium/net/Http2TestHandler.java",
@@ -13075,13 +12976,13 @@
         "android.test.base",
         "androidx.annotation_annotation-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //components/cronet/android:cronet_test_apk_jni__testing
+// GN: //components/cronet/android:cronet_test_apk_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_test_apk_jni__testing",
+    name: "cronet_aml_components_cronet_android_cronet_test_apk_jni__action__testing",
     srcs: [
         "components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java",
         "components/cronet/android/test/src/org/chromium/net/MockCertVerifier.java",
@@ -13149,9 +13050,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_test_apk_jni__testing
+// GN: //components/cronet/android:cronet_test_apk_jni__action__testing
 java_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_test_apk_jni__testing__java",
+    name: "cronet_aml_components_cronet_android_cronet_test_apk_jni__action__testing__java",
     srcs: [
         "components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java",
         "components/cronet/android/test/src/org/chromium/net/MockCertVerifier.java",
@@ -13241,7 +13142,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -13371,6 +13271,7 @@
         "cronet_aml_third_party_googletest_gtest__testing",
         "cronet_aml_third_party_icu_icui18n__testing",
         "cronet_aml_third_party_icu_icuuc_private__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
         "cronet_aml_third_party_libevent_libevent__testing",
         "cronet_aml_third_party_libxml_libxml__testing",
         "cronet_aml_third_party_libxml_libxml_utils__testing",
@@ -13379,14 +13280,15 @@
         "cronet_aml_third_party_modp_b64_modp_b64__testing",
         "cronet_aml_third_party_protobuf_protobuf_lite__testing",
         "cronet_aml_third_party_quic_trace_quic_trace_proto__testing",
+        "cronet_aml_third_party_re2_re2__testing",
         "cronet_aml_url_url__testing",
     ],
     generated_headers: [
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
-        "cronet_aml_components_cronet_android_cronet_test_apk_jni__testing",
-        "cronet_aml_components_cronet_android_cronet_tests_jni_headers__testing",
+        "cronet_aml_components_cronet_android_cronet_test_apk_jni__action__testing",
+        "cronet_aml_components_cronet_android_cronet_tests_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -13395,8 +13297,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -13413,7 +13315,9 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
         "-DU_ENABLE_DYLOAD=0",
@@ -13423,7 +13327,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -13455,6 +13359,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -13518,9 +13423,9 @@
     },
 }
 
-// GN: //components/cronet/android:cronet_tests_jni_headers__testing
+// GN: //components/cronet/android:cronet_tests_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_tests_jni_headers__testing",
+    name: "cronet_aml_components_cronet_android_cronet_tests_jni_headers__action__testing",
     srcs: [
         "components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java",
@@ -13570,9 +13475,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_tests_jni_headers__testing
+// GN: //components/cronet/android:cronet_tests_jni_headers__action__testing
 java_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_tests_jni_headers__testing__java",
+    name: "cronet_aml_components_cronet_android_cronet_tests_jni_headers__action__testing__java",
     srcs: [
         "components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java",
@@ -13644,11 +13549,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -13779,7 +13684,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -13918,6 +13822,7 @@
         "cronet_aml_third_party_googletest_gtest__testing",
         "cronet_aml_third_party_icu_icui18n__testing",
         "cronet_aml_third_party_icu_icuuc_private__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
         "cronet_aml_third_party_libevent_libevent__testing",
         "cronet_aml_third_party_libxml_libxml__testing",
         "cronet_aml_third_party_libxml_libxml_utils__testing",
@@ -13926,6 +13831,7 @@
         "cronet_aml_third_party_modp_b64_modp_b64__testing",
         "cronet_aml_third_party_protobuf_protobuf_lite__testing",
         "cronet_aml_third_party_quic_trace_quic_trace_proto__testing",
+        "cronet_aml_third_party_re2_re2__testing",
         "cronet_aml_url_url__testing",
     ],
     defaults: [
@@ -13935,8 +13841,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -13953,6 +13859,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -13963,7 +13870,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -13995,6 +13902,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -14248,6 +14156,48 @@
     ],
 }
 
+// GN: //components/cronet/android:httpengine_native_provider_base_java__testing
+java_library {
+    name: "cronet_aml_components_cronet_android_httpengine_native_provider_base_java__testing",
+    srcs: [
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamBuilderWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamCallbackWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidCallbackExceptionWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHeaderBlockWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineBuilderWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpExceptionWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidNetworkExceptionWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidQuicExceptionWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUploadDataProviderWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUploadDataSinkWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestBuilderWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestCallbackWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestStatusListenerWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlResponseInfoWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionTranslationUtils.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/HttpEngineNativeProvider.java",
+    ],
+    static_libs: [
+        "cronet_aml_base_base_java__testing",
+        "cronet_aml_build_android_build_java__testing",
+        "cronet_aml_components_cronet_android_cronet_api_java__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_java__testing",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+    min_sdk_version: "30",
+    libs: [
+        "androidx.annotation_annotation-nodeps",
+        "androidx.core_core-nodeps",
+    ],
+    sdk_version: "current",
+    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
+}
+
 // GN: //components/cronet/android:implementation_api_version
 java_genrule {
     name: "cronet_aml_components_cronet_android_implementation_api_version",
@@ -14678,8 +14628,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -14690,9 +14640,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -14775,8 +14726,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -14787,9 +14738,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15076,6 +15028,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -15090,21 +15043,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -15118,19 +15072,19 @@
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_components_cronet_cronet_buildflags",
         "cronet_aml_components_cronet_cronet_version_header_action",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
         "cronet_aml_crypto_buildflags",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -15140,21 +15094,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -15168,19 +15123,19 @@
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_components_cronet_cronet_buildflags",
         "cronet_aml_components_cronet_cronet_version_header_action",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
         "cronet_aml_crypto_buildflags",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -15188,8 +15143,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -15200,9 +15155,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15316,6 +15272,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -15334,19 +15291,19 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -15361,6 +15318,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -15379,19 +15337,19 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -15399,8 +15357,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -15411,9 +15369,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15524,6 +15483,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -15533,8 +15493,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -15544,21 +15504,21 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -15573,6 +15533,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -15582,8 +15543,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -15593,21 +15554,21 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -15616,8 +15577,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -15634,6 +15595,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -15644,7 +15606,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15676,6 +15638,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -15749,17 +15712,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15834,17 +15798,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15964,6 +15929,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -15976,21 +15942,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16010,21 +15977,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16042,17 +16010,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16154,6 +16123,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16183,6 +16153,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16205,17 +16176,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16319,6 +16291,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16328,8 +16301,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -16343,13 +16316,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -16364,6 +16337,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16373,8 +16347,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -16388,13 +16362,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -16403,8 +16377,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -16421,6 +16395,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -16431,7 +16406,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16463,6 +16438,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -16530,6 +16506,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -16543,21 +16520,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16578,21 +16556,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16611,8 +16590,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -16623,9 +16602,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16730,6 +16710,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16760,6 +16741,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16783,8 +16765,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -16795,9 +16777,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16885,6 +16868,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -16897,21 +16881,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16931,21 +16916,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16963,8 +16949,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_MIRACLE_PARAMETER_IMPL",
@@ -16972,9 +16958,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17076,6 +17063,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17105,6 +17093,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17127,8 +17116,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_MIRACLE_PARAMETER_IMPL",
@@ -17136,9 +17125,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17217,9 +17207,9 @@
     },
 }
 
-// GN: //components/prefs/android:jni_headers
+// GN: //components/prefs/android:jni_headers__action
 cc_genrule {
-    name: "cronet_aml_components_prefs_android_jni_headers",
+    name: "cronet_aml_components_prefs_android_jni_headers__action",
     srcs: [
         "components/prefs/android/java/src/org/chromium/components/prefs/PrefService.java",
     ],
@@ -17259,9 +17249,9 @@
     ],
 }
 
-// GN: //components/prefs/android:jni_headers__testing
+// GN: //components/prefs/android:jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_components_prefs_android_jni_headers__testing",
+    name: "cronet_aml_components_prefs_android_jni_headers__action__testing",
     srcs: [
         "components/prefs/android/java/src/org/chromium/components/prefs/PrefService.java",
     ],
@@ -17327,6 +17317,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -17339,21 +17330,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -17364,7 +17356,7 @@
         "cronet_aml_build_chromecast_buildflags",
         "cronet_aml_build_chromeos_buildflags",
         "cronet_aml_build_config_compiler_compiler_buildflags",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -17374,21 +17366,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -17399,7 +17392,7 @@
         "cronet_aml_build_chromecast_buildflags",
         "cronet_aml_build_chromeos_buildflags",
         "cronet_aml_build_config_compiler_compiler_buildflags",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -17408,17 +17401,19 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DCOMPONENTS_PREFS_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17540,6 +17535,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17555,7 +17551,7 @@
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -17570,6 +17566,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17585,7 +17582,7 @@
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -17594,17 +17591,19 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DCOMPONENTS_PREFS_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17711,6 +17710,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17720,15 +17720,15 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -17743,6 +17743,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17752,15 +17753,15 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -17769,8 +17770,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -17783,6 +17784,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
@@ -17792,7 +17794,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17820,6 +17822,7 @@
         "third_party/icu/source/i18n/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -17952,6 +17955,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -17964,21 +17968,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -17999,21 +18004,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -18033,17 +18039,18 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DCRYPTO_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -18161,6 +18168,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -18191,6 +18199,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -18213,8 +18222,8 @@
     ],
     cflags: [
         "-DCRYPTO_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -18222,7 +18231,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -18258,10 +18267,14 @@
             ],
         },
         android_arm: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -18285,10 +18298,14 @@
             ],
         },
         android_arm64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -18313,10 +18330,14 @@
             ],
         },
         android_riscv64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -18339,10 +18360,14 @@
             ],
         },
         android_x86: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -18366,10 +18391,14 @@
             ],
         },
         android_x86_64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -18435,6 +18464,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -18465,6 +18495,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -18488,17 +18519,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -18595,6 +18627,7 @@
         "-Wno-unreachable-code-loop-increment",
         "-Wno-unused-parameter",
         "-fPIC",
+        "-fprofile-list=external/cronet/exclude_coverage.list",
     ],
     stl: "none",
     cpp_std: "c++17",
@@ -18820,7 +18853,7 @@
     srcs: [
         ":cronet_aml_net_android_net_android_java_enums_srcjar",
         ":cronet_aml_net_android_net_errors_java",
-        ":cronet_aml_net_net_jni_headers__java",
+        ":cronet_aml_net_net_jni_headers__action__java",
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
         "net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
@@ -18867,7 +18900,7 @@
     srcs: [
         ":cronet_aml_net_android_net_android_java_enums_srcjar__testing",
         ":cronet_aml_net_android_net_errors_java__testing",
-        ":cronet_aml_net_net_jni_headers__testing__java",
+        ":cronet_aml_net_net_jni_headers__action__testing__java",
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
         "net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
@@ -18913,7 +18946,7 @@
     name: "cronet_aml_net_android_net_java_test_support__testing",
     srcs: [
         ":cronet_aml_net_android_net_java_test_support_enums_srcjar__testing",
-        ":cronet_aml_net_android_net_test_support_jni__testing__java",
+        ":cronet_aml_net_android_net_test_support_jni__action__testing__java",
         "net/test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerRule.java",
@@ -18967,9 +19000,9 @@
     ],
 }
 
-// GN: //net/android:net_test_support_jni__testing
+// GN: //net/android:net_test_support_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_net_android_net_test_support_jni__testing",
+    name: "cronet_aml_net_android_net_test_support_jni__action__testing",
     srcs: [
         "net/test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java",
     ],
@@ -19007,9 +19040,9 @@
     ],
 }
 
-// GN: //net/android:net_test_support_jni__testing
+// GN: //net/android:net_test_support_jni__action__testing
 java_genrule {
-    name: "cronet_aml_net_android_net_test_support_jni__testing__java",
+    name: "cronet_aml_net_android_net_test_support_jni__action__testing__java",
     srcs: [
         "net/test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java",
     ],
@@ -19048,7 +19081,7 @@
 java_library {
     name: "cronet_aml_net_android_net_test_support_provider_java__testing",
     srcs: [
-        ":cronet_aml_net_android_net_test_support_provider_jni__testing__java",
+        ":cronet_aml_net_android_net_test_support_provider_jni__action__testing__java",
         "net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
         "net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticatorService.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
@@ -19073,9 +19106,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //net/android:net_test_support_provider_jni__testing
+// GN: //net/android:net_test_support_provider_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_net_android_net_test_support_provider_jni__testing",
+    name: "cronet_aml_net_android_net_test_support_provider_jni__action__testing",
     srcs: [
         "net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
@@ -19119,9 +19152,9 @@
     ],
 }
 
-// GN: //net/android:net_test_support_provider_jni__testing
+// GN: //net/android:net_test_support_provider_jni__action__testing
 java_genrule {
-    name: "cronet_aml_net_android_net_test_support_provider_jni__testing__java",
+    name: "cronet_aml_net_android_net_test_support_provider_jni__action__testing__java",
     srcs: [
         "net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
@@ -19166,7 +19199,7 @@
 java_library {
     name: "cronet_aml_net_android_net_tests_java__testing",
     srcs: [
-        ":cronet_aml_net_android_net_tests_jni__testing__java",
+        ":cronet_aml_net_android_net_tests_jni__action__testing__java",
         "net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
         "net/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTest.java",
         "net/android/javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java",
@@ -19205,9 +19238,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //net/android:net_tests_jni__testing
+// GN: //net/android:net_tests_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_net_android_net_tests_jni__testing",
+    name: "cronet_aml_net_android_net_tests_jni__action__testing",
     srcs: [
         "net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
         "net/android/javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java",
@@ -19251,9 +19284,9 @@
     ],
 }
 
-// GN: //net/android:net_tests_jni__testing
+// GN: //net/android:net_tests_jni__action__testing
 java_genrule {
-    name: "cronet_aml_net_android_net_tests_jni__testing__java",
+    name: "cronet_aml_net_android_net_tests_jni__action__testing__java",
     srcs: [
         "net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
         "net/android/javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java",
@@ -19648,6 +19681,7 @@
     name: "cronet_aml_net_constants",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -19660,21 +19694,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -19694,21 +19729,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -19726,17 +19762,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -19835,6 +19872,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -19864,6 +19902,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -19886,17 +19925,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20069,6 +20109,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -20083,21 +20124,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20114,12 +20156,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -20129,21 +20171,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20160,12 +20203,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -20173,8 +20216,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -20187,9 +20230,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20338,6 +20383,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -20359,12 +20405,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -20379,6 +20425,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -20400,12 +20447,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -20413,8 +20460,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -20427,9 +20474,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20518,6 +20567,7 @@
     name: "cronet_aml_net_dns_dns_client",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -20532,21 +20582,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20563,12 +20614,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -20578,21 +20629,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20609,12 +20661,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -20622,8 +20674,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -20636,9 +20688,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20744,6 +20798,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -20765,12 +20820,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -20785,6 +20840,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -20806,12 +20862,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -20819,8 +20875,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -20833,9 +20889,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20924,6 +20982,7 @@
     name: "cronet_aml_net_dns_host_resolver",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -20938,21 +20997,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20969,12 +21029,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -20984,21 +21044,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21015,12 +21076,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21028,8 +21089,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21042,9 +21103,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21150,6 +21213,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21171,12 +21235,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -21191,6 +21255,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21212,12 +21277,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21225,8 +21290,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21239,9 +21304,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21330,6 +21397,7 @@
     name: "cronet_aml_net_dns_host_resolver_manager",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -21344,21 +21412,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21375,12 +21444,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -21390,21 +21459,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21421,12 +21491,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21434,8 +21504,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21448,9 +21518,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21556,6 +21628,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21577,12 +21650,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -21597,6 +21670,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21618,12 +21692,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21631,8 +21705,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21645,9 +21719,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21736,6 +21812,7 @@
     name: "cronet_aml_net_dns_mdns_client",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -21750,21 +21827,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21781,12 +21859,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -21796,21 +21874,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21827,12 +21906,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21840,8 +21919,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21854,9 +21933,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21962,6 +22043,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21983,12 +22065,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -22003,6 +22085,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22024,12 +22107,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22037,8 +22120,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -22051,9 +22134,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22153,6 +22238,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -22167,21 +22253,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -22198,12 +22285,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -22213,21 +22300,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -22244,12 +22332,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22257,8 +22345,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -22271,9 +22359,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22390,6 +22480,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22411,12 +22502,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -22431,6 +22522,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22452,12 +22544,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22465,8 +22557,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -22479,9 +22571,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22592,6 +22686,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22613,12 +22708,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -22633,6 +22728,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22654,12 +22750,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22667,8 +22763,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -22684,10 +22780,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22715,6 +22812,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -22801,6 +22899,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22822,12 +22921,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -22842,6 +22941,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22863,12 +22963,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22876,8 +22976,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -22893,10 +22993,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22924,6 +23025,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -23037,6 +23139,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23046,8 +23149,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -23061,13 +23164,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -23082,6 +23185,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23091,8 +23195,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -23106,13 +23210,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -23121,8 +23225,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -23139,6 +23243,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -23149,7 +23254,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -23181,6 +23286,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -23306,6 +23412,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23315,8 +23422,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -23329,12 +23436,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -23349,6 +23456,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23358,8 +23466,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -23372,12 +23480,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -23386,8 +23494,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -23404,6 +23512,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
@@ -23413,7 +23522,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -23445,6 +23554,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -23511,6 +23621,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -23525,21 +23636,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -23556,12 +23668,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -23571,21 +23683,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -23602,12 +23715,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -23615,8 +23728,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -23629,9 +23742,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -23740,6 +23855,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23761,12 +23877,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -23781,6 +23897,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23802,12 +23919,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -23815,8 +23932,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -23829,9 +23946,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -24011,8 +24130,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -24023,9 +24142,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -24108,8 +24228,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -24120,9 +24240,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -24382,34 +24503,6 @@
         "net/cert/merkle_tree_leaf.cc",
         "net/cert/multi_log_ct_verifier.cc",
         "net/cert/multi_threaded_cert_verifier.cc",
-        "net/cert/ocsp_verify_result.cc",
-        "net/cert/pem.cc",
-        "net/cert/pki/cert_error_id.cc",
-        "net/cert/pki/cert_error_params.cc",
-        "net/cert/pki/cert_errors.cc",
-        "net/cert/pki/cert_issuer_source_static.cc",
-        "net/cert/pki/certificate_policies.cc",
-        "net/cert/pki/common_cert_errors.cc",
-        "net/cert/pki/crl.cc",
-        "net/cert/pki/extended_key_usage.cc",
-        "net/cert/pki/general_names.cc",
-        "net/cert/pki/ip_util.cc",
-        "net/cert/pki/name_constraints.cc",
-        "net/cert/pki/ocsp.cc",
-        "net/cert/pki/parse_certificate.cc",
-        "net/cert/pki/parse_name.cc",
-        "net/cert/pki/parsed_certificate.cc",
-        "net/cert/pki/path_builder.cc",
-        "net/cert/pki/revocation_util.cc",
-        "net/cert/pki/signature_algorithm.cc",
-        "net/cert/pki/simple_path_builder_delegate.cc",
-        "net/cert/pki/string_util.cc",
-        "net/cert/pki/trust_store.cc",
-        "net/cert/pki/trust_store_collection.cc",
-        "net/cert/pki/trust_store_in_memory.cc",
-        "net/cert/pki/verify_certificate_chain.cc",
-        "net/cert/pki/verify_name_match.cc",
-        "net/cert/pki/verify_signed_data.cc",
         "net/cert/sct_status_flags.cc",
         "net/cert/signed_certificate_timestamp.cc",
         "net/cert/signed_certificate_timestamp_and_status.cc",
@@ -24442,11 +24535,6 @@
         "net/cookies/parsed_cookie.cc",
         "net/cookies/site_for_cookies.cc",
         "net/cookies/static_cookie_policy.cc",
-        "net/der/encode_values.cc",
-        "net/der/input.cc",
-        "net/der/parse_values.cc",
-        "net/der/parser.cc",
-        "net/der/tag.cc",
         "net/disk_cache/backend_cleanup_tracker.cc",
         "net/disk_cache/blockfile/addr.cc",
         "net/disk_cache/blockfile/backend_impl.cc",
@@ -24470,7 +24558,7 @@
         "net/disk_cache/memory/mem_backend_impl.cc",
         "net/disk_cache/memory/mem_entry_impl.cc",
         "net/disk_cache/net_log_parameters.cc",
-        "net/disk_cache/simple/post_doom_waiter.cc",
+        "net/disk_cache/simple/post_operation_waiter.cc",
         "net/disk_cache/simple/simple_backend_impl.cc",
         "net/disk_cache/simple/simple_entry_format.cc",
         "net/disk_cache/simple/simple_entry_impl.cc",
@@ -24497,6 +24585,8 @@
         "net/first_party_sets/first_party_sets_cache_filter.cc",
         "net/first_party_sets/first_party_sets_context_config.cc",
         "net/first_party_sets/global_first_party_sets.cc",
+        "net/first_party_sets/local_set_declaration.cc",
+        "net/first_party_sets/sets_mutation.cc",
         "net/http/alternative_service.cc",
         "net/http/bidirectional_stream.cc",
         "net/http/bidirectional_stream_impl.cc",
@@ -24525,6 +24615,7 @@
         "net/http/http_cache_transaction.cc",
         "net/http/http_cache_writers.cc",
         "net/http/http_chunked_decoder.cc",
+        "net/http/http_connection_info.cc",
         "net/http/http_content_disposition.cc",
         "net/http/http_log_util.cc",
         "net/http/http_network_layer.cc",
@@ -24759,6 +24850,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -24773,21 +24865,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -24804,12 +24897,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -24819,21 +24912,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -24850,12 +24944,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -24863,8 +24957,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -24878,9 +24972,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -25096,34 +25192,6 @@
         "net/cert/merkle_tree_leaf.cc",
         "net/cert/multi_log_ct_verifier.cc",
         "net/cert/multi_threaded_cert_verifier.cc",
-        "net/cert/ocsp_verify_result.cc",
-        "net/cert/pem.cc",
-        "net/cert/pki/cert_error_id.cc",
-        "net/cert/pki/cert_error_params.cc",
-        "net/cert/pki/cert_errors.cc",
-        "net/cert/pki/cert_issuer_source_static.cc",
-        "net/cert/pki/certificate_policies.cc",
-        "net/cert/pki/common_cert_errors.cc",
-        "net/cert/pki/crl.cc",
-        "net/cert/pki/extended_key_usage.cc",
-        "net/cert/pki/general_names.cc",
-        "net/cert/pki/ip_util.cc",
-        "net/cert/pki/name_constraints.cc",
-        "net/cert/pki/ocsp.cc",
-        "net/cert/pki/parse_certificate.cc",
-        "net/cert/pki/parse_name.cc",
-        "net/cert/pki/parsed_certificate.cc",
-        "net/cert/pki/path_builder.cc",
-        "net/cert/pki/revocation_util.cc",
-        "net/cert/pki/signature_algorithm.cc",
-        "net/cert/pki/simple_path_builder_delegate.cc",
-        "net/cert/pki/string_util.cc",
-        "net/cert/pki/trust_store.cc",
-        "net/cert/pki/trust_store_collection.cc",
-        "net/cert/pki/trust_store_in_memory.cc",
-        "net/cert/pki/verify_certificate_chain.cc",
-        "net/cert/pki/verify_name_match.cc",
-        "net/cert/pki/verify_signed_data.cc",
         "net/cert/sct_status_flags.cc",
         "net/cert/signed_certificate_timestamp.cc",
         "net/cert/signed_certificate_timestamp_and_status.cc",
@@ -25156,11 +25224,6 @@
         "net/cookies/parsed_cookie.cc",
         "net/cookies/site_for_cookies.cc",
         "net/cookies/static_cookie_policy.cc",
-        "net/der/encode_values.cc",
-        "net/der/input.cc",
-        "net/der/parse_values.cc",
-        "net/der/parser.cc",
-        "net/der/tag.cc",
         "net/disk_cache/backend_cleanup_tracker.cc",
         "net/disk_cache/blockfile/addr.cc",
         "net/disk_cache/blockfile/backend_impl.cc",
@@ -25184,7 +25247,7 @@
         "net/disk_cache/memory/mem_backend_impl.cc",
         "net/disk_cache/memory/mem_entry_impl.cc",
         "net/disk_cache/net_log_parameters.cc",
-        "net/disk_cache/simple/post_doom_waiter.cc",
+        "net/disk_cache/simple/post_operation_waiter.cc",
         "net/disk_cache/simple/simple_backend_impl.cc",
         "net/disk_cache/simple/simple_entry_format.cc",
         "net/disk_cache/simple/simple_entry_impl.cc",
@@ -25211,6 +25274,8 @@
         "net/first_party_sets/first_party_sets_cache_filter.cc",
         "net/first_party_sets/first_party_sets_context_config.cc",
         "net/first_party_sets/global_first_party_sets.cc",
+        "net/first_party_sets/local_set_declaration.cc",
+        "net/first_party_sets/sets_mutation.cc",
         "net/http/alternative_service.cc",
         "net/http/bidirectional_stream.cc",
         "net/http/bidirectional_stream_impl.cc",
@@ -25239,6 +25304,7 @@
         "net/http/http_cache_transaction.cc",
         "net/http/http_cache_writers.cc",
         "net/http/http_chunked_decoder.cc",
+        "net/http/http_connection_info.cc",
         "net/http/http_content_disposition.cc",
         "net/http/http_log_util.cc",
         "net/http/http_network_layer.cc",
@@ -25490,6 +25556,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -25511,12 +25578,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -25531,6 +25598,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -25552,12 +25620,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -25565,8 +25633,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -25580,9 +25648,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -25686,6 +25756,7 @@
     name: "cronet_aml_net_net_deps",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -25700,21 +25771,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -25728,7 +25800,7 @@
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_url_buildflags",
     ],
     export_generated_headers: [
@@ -25739,21 +25811,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -25767,7 +25840,7 @@
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_url_buildflags",
     ],
     defaults: [
@@ -25776,8 +25849,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -25790,9 +25863,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -25895,6 +25970,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -25913,7 +25989,7 @@
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_url_buildflags__testing",
     ],
     export_generated_headers: [
@@ -25929,6 +26005,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -25947,7 +26024,7 @@
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_url_buildflags__testing",
     ],
     defaults: [
@@ -25956,8 +26033,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -25970,9 +26047,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -26053,9 +26132,9 @@
     },
 }
 
-// GN: //net:net_jni_headers
+// GN: //net:net_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_net_net_jni_headers",
+    name: "cronet_aml_net_net_jni_headers__action",
     srcs: [
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
@@ -26167,9 +26246,9 @@
     ],
 }
 
-// GN: //net:net_jni_headers
+// GN: //net:net_jni_headers__action
 java_genrule {
-    name: "cronet_aml_net_net_jni_headers__java",
+    name: "cronet_aml_net_net_jni_headers__action__java",
     srcs: [
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
@@ -26278,9 +26357,9 @@
     ],
 }
 
-// GN: //net:net_jni_headers__testing
+// GN: //net:net_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_net_net_jni_headers__testing",
+    name: "cronet_aml_net_net_jni_headers__action__testing",
     srcs: [
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
@@ -26390,9 +26469,9 @@
     ],
 }
 
-// GN: //net:net_jni_headers__testing
+// GN: //net:net_jni_headers__action__testing
 java_genrule {
-    name: "cronet_aml_net_net_jni_headers__testing__java",
+    name: "cronet_aml_net_net_jni_headers__action__testing__java",
     srcs: [
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
@@ -26521,8 +26600,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -26534,9 +26613,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -26619,8 +26699,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -26632,9 +26712,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -26782,6 +26863,7 @@
     name: "cronet_aml_net_net_public_deps",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -26796,21 +26878,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -26828,7 +26911,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -26838,21 +26921,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -26870,7 +26954,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -26878,8 +26962,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -26890,9 +26974,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -26997,6 +27082,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -27019,7 +27105,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -27034,6 +27120,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -27056,7 +27143,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -27064,8 +27151,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -27076,9 +27163,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -27242,33 +27330,6 @@
         "net/cert/merkle_tree_leaf_unittest.cc",
         "net/cert/multi_log_ct_verifier_unittest.cc",
         "net/cert/multi_threaded_cert_verifier_unittest.cc",
-        "net/cert/pem_unittest.cc",
-        "net/cert/pki/cert_issuer_source_static_unittest.cc",
-        "net/cert/pki/certificate_policies_unittest.cc",
-        "net/cert/pki/crl_unittest.cc",
-        "net/cert/pki/extended_key_usage_unittest.cc",
-        "net/cert/pki/general_names_unittest.cc",
-        "net/cert/pki/ip_util_unittest.cc",
-        "net/cert/pki/name_constraints_unittest.cc",
-        "net/cert/pki/nist_pkits_unittest.cc",
-        "net/cert/pki/ocsp_unittest.cc",
-        "net/cert/pki/parse_certificate_unittest.cc",
-        "net/cert/pki/parse_name_unittest.cc",
-        "net/cert/pki/parsed_certificate_unittest.cc",
-        "net/cert/pki/path_builder_pkits_unittest.cc",
-        "net/cert/pki/path_builder_unittest.cc",
-        "net/cert/pki/path_builder_verify_certificate_chain_unittest.cc",
-        "net/cert/pki/revocation_util_unittest.cc",
-        "net/cert/pki/signature_algorithm_unittest.cc",
-        "net/cert/pki/simple_path_builder_delegate_unittest.cc",
-        "net/cert/pki/string_util_unittest.cc",
-        "net/cert/pki/test_helpers.cc",
-        "net/cert/pki/trust_store_collection_unittest.cc",
-        "net/cert/pki/trust_store_unittest.cc",
-        "net/cert/pki/verify_certificate_chain_pkits_unittest.cc",
-        "net/cert/pki/verify_certificate_chain_unittest.cc",
-        "net/cert/pki/verify_name_match_unittest.cc",
-        "net/cert/pki/verify_signed_data_unittest.cc",
         "net/cert/signed_certificate_timestamp_unittest.cc",
         "net/cert/symantec_certs_unittest.cc",
         "net/cert/test_root_certs_unittest.cc",
@@ -27288,10 +27349,6 @@
         "net/cookies/parsed_cookie_unittest.cc",
         "net/cookies/site_for_cookies_unittest.cc",
         "net/cookies/static_cookie_policy_unittest.cc",
-        "net/der/encode_values_unittest.cc",
-        "net/der/input_unittest.cc",
-        "net/der/parse_values_unittest.cc",
-        "net/der/parser_unittest.cc",
         "net/disk_cache/backend_cleanup_tracker_unittest.cc",
         "net/disk_cache/backend_unittest.cc",
         "net/disk_cache/blockfile/addr_unittest.cc",
@@ -27317,6 +27374,8 @@
         "net/first_party_sets/first_party_sets_cache_filter_unittest.cc",
         "net/first_party_sets/first_party_sets_context_config_unittest.cc",
         "net/first_party_sets/global_first_party_sets_unittest.cc",
+        "net/first_party_sets/local_set_declaration_unittest.cc",
+        "net/first_party_sets/sets_mutation_unittest.cc",
         "net/http/alternative_service_unittest.cc",
         "net/http/bidirectional_stream_unittest.cc",
         "net/http/broken_alternative_services_unittest.cc",
@@ -27359,6 +27418,7 @@
         "net/http/http_stream_factory_unittest.cc",
         "net/http/http_stream_parser_unittest.cc",
         "net/http/http_stream_request_unittest.cc",
+        "net/http/http_transaction_test_util_unittest.cc",
         "net/http/http_util_unittest.cc",
         "net/http/http_vary_data_unittest.cc",
         "net/http/mock_allow_http_auth_preferences.cc",
@@ -27523,7 +27583,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -27680,6 +27739,7 @@
         "cronet_aml_third_party_googletest_gtest__testing",
         "cronet_aml_third_party_icu_icui18n__testing",
         "cronet_aml_third_party_icu_icuuc_private__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
         "cronet_aml_third_party_libevent_libevent__testing",
         "cronet_aml_third_party_libxml_libxml__testing",
         "cronet_aml_third_party_libxml_libxml_utils__testing",
@@ -27687,21 +27747,22 @@
         "cronet_aml_third_party_modp_b64_modp_b64__testing",
         "cronet_aml_third_party_protobuf_protobuf_lite__testing",
         "cronet_aml_third_party_quic_trace_quic_trace_proto__testing",
+        "cronet_aml_third_party_re2_re2__testing",
         "cronet_aml_url_url__testing",
     ],
     generated_headers: [
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
-        "cronet_aml_net_android_net_test_support_jni__testing",
-        "cronet_aml_net_android_net_test_support_provider_jni__testing",
-        "cronet_aml_net_android_net_tests_jni__testing",
+        "cronet_aml_net_android_net_test_support_jni__action__testing",
+        "cronet_aml_net_android_net_test_support_provider_jni__action__testing",
+        "cronet_aml_net_android_net_tests_jni__action__testing",
         "cronet_aml_net_base_registry_controlled_domains_lookup_strings_test_sets__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_url_buildflags__testing",
     ],
     defaults: [
@@ -27711,8 +27772,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -27729,7 +27790,9 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
         "-DU_ENABLE_DYLOAD=0",
@@ -27739,7 +27802,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -27773,6 +27836,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -27844,6 +27908,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -27856,21 +27921,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -27890,21 +27956,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -27922,17 +27989,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28034,6 +28102,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28063,6 +28132,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28085,17 +28155,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28199,6 +28270,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28220,12 +28292,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -28240,6 +28312,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28261,12 +28334,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -28274,8 +28347,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -28286,9 +28359,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28402,6 +28476,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28411,8 +28486,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -28426,13 +28501,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -28447,6 +28522,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28456,8 +28532,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -28471,13 +28547,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -28486,8 +28562,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -28504,6 +28580,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -28514,7 +28591,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28546,6 +28623,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -28635,6 +28713,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28656,13 +28735,13 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -28677,6 +28756,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28698,13 +28778,13 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -28712,8 +28792,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -28724,9 +28804,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28834,6 +28915,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28855,12 +28937,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -28875,6 +28957,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28896,12 +28979,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -28909,8 +28992,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -28926,10 +29009,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28957,6 +29041,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -29026,10 +29111,10 @@
         "net/base/mock_network_change_notifier.cc",
         "net/base/test_completion_callback.cc",
         "net/base/test_data_stream.cc",
+        "net/cert/internal/test_helpers.cc",
         "net/cert/mock_cert_net_fetcher.cc",
         "net/cert/mock_cert_verifier.cc",
         "net/cert/mock_client_cert_verifier.cc",
-        "net/cert/pki/mock_signature_verify_cache.cc",
         "net/cookies/cookie_change_dispatcher_test_helpers.cc",
         "net/cookies/cookie_monster_store_test.cc",
         "net/cookies/cookie_store_test_callbacks.cc",
@@ -29115,6 +29200,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29124,8 +29210,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -29139,13 +29225,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -29160,6 +29246,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29169,8 +29256,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -29184,13 +29271,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -29199,8 +29286,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -29217,6 +29304,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -29227,7 +29315,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -29259,6 +29347,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -29343,6 +29432,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29363,7 +29453,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -29378,6 +29468,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29398,7 +29489,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -29406,8 +29497,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -29419,9 +29510,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -29530,6 +29622,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29561,6 +29654,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29585,8 +29679,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -29598,9 +29692,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -29777,6 +29872,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29786,8 +29882,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -29801,7 +29897,7 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_blind_sign_auth_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
@@ -29809,7 +29905,7 @@
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -29824,6 +29920,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29833,8 +29930,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -29848,7 +29945,7 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_blind_sign_auth_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
@@ -29856,7 +29953,7 @@
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -29865,8 +29962,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -29877,9 +29974,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -29973,6 +30071,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -29986,21 +30085,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -30021,21 +30121,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -30054,8 +30155,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -30067,9 +30168,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -30173,6 +30275,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -30203,6 +30306,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -30226,8 +30330,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -30239,9 +30343,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -30441,8 +30546,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -30454,9 +30559,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -30539,8 +30645,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -30552,9 +30658,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -30998,9 +31105,12 @@
         "net/third_party/quiche/src/quiche/spdy/core/spdy_prefixed_buffer_reader.cc",
         "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.cc",
         "net/third_party/quiche/src/quiche/web_transport/complete_buffer_visitor.cc",
+        "net/third_party/quiche/src/quiche/web_transport/encapsulated/encapsulated_web_transport.cc",
+        "net/third_party/quiche/src/quiche/web_transport/web_transport_headers.cc",
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -31015,21 +31125,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -31043,7 +31154,7 @@
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -31053,21 +31164,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -31081,7 +31193,7 @@
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -31089,8 +31201,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -31102,9 +31214,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -31486,6 +31599,8 @@
         "net/third_party/quiche/src/quiche/spdy/core/spdy_prefixed_buffer_reader.cc",
         "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.cc",
         "net/third_party/quiche/src/quiche/web_transport/complete_buffer_visitor.cc",
+        "net/third_party/quiche/src/quiche/web_transport/encapsulated/encapsulated_web_transport.cc",
+        "net/third_party/quiche/src/quiche/web_transport/web_transport_headers.cc",
     ],
     shared_libs: [
         "libandroid",
@@ -31506,6 +31621,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -31524,7 +31640,7 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -31539,6 +31655,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -31557,7 +31674,7 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -31565,8 +31682,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -31578,9 +31695,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -31781,6 +31899,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -31790,8 +31909,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -31805,13 +31924,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -31826,6 +31945,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -31835,8 +31955,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -31850,13 +31970,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -31865,8 +31985,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -31883,6 +32003,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -31893,7 +32014,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -31925,6 +32046,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -32248,6 +32370,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32257,8 +32380,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -32272,7 +32395,7 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_blind_sign_auth_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
@@ -32280,7 +32403,7 @@
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -32295,6 +32418,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32304,8 +32428,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -32319,7 +32443,7 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_blind_sign_auth_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
@@ -32327,7 +32451,7 @@
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -32336,8 +32460,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -32353,10 +32477,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -32387,6 +32512,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -32472,6 +32598,7 @@
         "net/third_party/quiche/src/quiche/quic/tools/quic_tcp_like_trace_converter.cc",
         "net/third_party/quiche/src/quiche/quic/tools/quic_url.cc",
         "net/third_party/quiche/src/quiche/quic/tools/simple_ticket_crypter.cc",
+        "net/third_party/quiche/src/quiche/quic/tools/web_transport_only_backend.cc",
     ],
     shared_libs: [
         "libandroid",
@@ -32492,6 +32619,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32513,13 +32641,13 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -32534,6 +32662,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32555,13 +32684,13 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -32569,8 +32698,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -32581,9 +32710,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -32690,6 +32820,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32719,6 +32850,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32739,8 +32871,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -32748,7 +32880,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -32784,10 +32916,14 @@
             ],
         },
         android_arm: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -32811,10 +32947,14 @@
             ],
         },
         android_arm64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -32839,10 +32979,14 @@
             ],
         },
         android_riscv64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -32865,10 +33009,14 @@
             ],
         },
         android_x86: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -32892,10 +33040,14 @@
             ],
         },
         android_x86_64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -32961,6 +33113,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32978,7 +33131,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -32993,6 +33146,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33010,7 +33164,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -33018,17 +33172,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33117,7 +33272,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -33211,8 +33365,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
@@ -33228,7 +33382,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33287,6 +33441,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33316,6 +33471,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33336,8 +33492,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
@@ -33353,7 +33509,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33405,6 +33561,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33434,6 +33591,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33456,17 +33614,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33550,6 +33709,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -33562,21 +33722,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -33596,21 +33757,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -33628,17 +33790,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33740,6 +33903,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33769,6 +33933,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33791,17 +33956,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33888,6 +34054,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -33900,21 +34067,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -33934,21 +34102,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -33966,8 +34135,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_URI_TEMPLATE_IMPL",
@@ -33975,9 +34144,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34079,6 +34249,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34108,6 +34279,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34130,8 +34302,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_URI_TEMPLATE_IMPL",
@@ -34139,9 +34311,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34224,7 +34397,7 @@
 java_library {
     name: "cronet_aml_testing_android_native_test_native_main_runner_java__testing",
     srcs: [
-        ":cronet_aml_testing_android_native_test_native_main_runner_jni__testing__java",
+        ":cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing__java",
         "testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java",
     ],
     static_libs: [
@@ -34238,9 +34411,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //testing/android/native_test:native_main_runner_jni__testing
+// GN: //testing/android/native_test:native_main_runner_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
+    name: "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
     srcs: [
         "testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java",
     ],
@@ -34278,9 +34451,9 @@
     ],
 }
 
-// GN: //testing/android/native_test:native_main_runner_jni__testing
+// GN: //testing/android/native_test:native_main_runner_jni__action__testing
 java_genrule {
-    name: "cronet_aml_testing_android_native_test_native_main_runner_jni__testing__java",
+    name: "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing__java",
     srcs: [
         "testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java",
     ],
@@ -34319,7 +34492,7 @@
 java_library {
     name: "cronet_aml_testing_android_native_test_native_test_java__testing",
     srcs: [
-        ":cronet_aml_testing_android_native_test_native_test_jni__testing__java",
+        ":cronet_aml_testing_android_native_test_native_test_jni__action__testing__java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTest.java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTestApplication.java",
@@ -34352,9 +34525,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //testing/android/native_test:native_test_jni__testing
+// GN: //testing/android/native_test:native_test_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_testing_android_native_test_native_test_jni__testing",
+    name: "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     srcs: [
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTest.java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java",
@@ -34398,9 +34571,9 @@
     ],
 }
 
-// GN: //testing/android/native_test:native_test_jni__testing
+// GN: //testing/android/native_test:native_test_jni__action__testing
 java_genrule {
-    name: "cronet_aml_testing_android_native_test_native_test_jni__testing__java",
+    name: "cronet_aml_testing_android_native_test_native_test_jni__action__testing__java",
     srcs: [
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTest.java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java",
@@ -34465,6 +34638,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34474,16 +34648,16 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
-        "cronet_aml_testing_android_native_test_native_test_jni__testing",
+        "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
+        "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -34498,6 +34672,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34507,16 +34682,16 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
-        "cronet_aml_testing_android_native_test_native_test_jni__testing",
+        "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
+        "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -34525,17 +34700,18 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34641,6 +34817,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34650,16 +34827,16 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
-        "cronet_aml_testing_android_native_test_native_test_jni__testing",
+        "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
+        "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -34674,6 +34851,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34683,16 +34861,16 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
-        "cronet_aml_testing_android_native_test_native_test_jni__testing",
+        "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
+        "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -34701,8 +34879,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -34715,7 +34893,9 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -34724,7 +34904,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34752,6 +34932,7 @@
         "third_party/icu/source/i18n/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -34850,6 +35031,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34879,6 +35061,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34901,8 +35084,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -34914,9 +35097,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34938,6 +35122,7 @@
         "third_party/googletest/src/googletest/include/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -35020,6 +35205,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -35049,6 +35235,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -35071,8 +35258,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -35084,10 +35271,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -35108,6 +35296,7 @@
         "third_party/googletest/src/googletest/include/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -35184,17 +35373,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -35269,8 +35459,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -35278,7 +35468,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -35314,6 +35504,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -35324,6 +35515,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -35335,6 +35527,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35344,6 +35537,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -35354,6 +35548,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -35396,17 +35591,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -35477,8 +35673,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -35486,7 +35682,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -35515,6 +35711,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35524,6 +35721,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -35534,6 +35732,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35543,6 +35742,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -35552,6 +35752,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -35588,17 +35789,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -35665,8 +35867,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -35674,7 +35876,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -35703,6 +35905,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35712,6 +35915,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -35722,6 +35926,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35731,6 +35936,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -35740,6 +35946,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -35776,17 +35983,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -35853,8 +36061,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -35862,7 +36070,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -35891,6 +36099,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35900,6 +36109,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -35910,6 +36120,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35919,6 +36130,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -35928,6 +36140,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -35964,17 +36177,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36041,8 +36255,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36050,7 +36264,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36079,6 +36293,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36088,6 +36303,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36098,6 +36314,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36107,6 +36324,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36116,6 +36334,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36152,17 +36371,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36229,8 +36449,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36238,7 +36458,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36267,6 +36487,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36276,6 +36497,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36286,6 +36508,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36295,6 +36518,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36304,6 +36528,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36340,17 +36565,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36417,8 +36643,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36426,7 +36652,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36455,6 +36681,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36464,6 +36691,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36474,6 +36702,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36483,6 +36712,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36492,6 +36722,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36528,17 +36759,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36605,8 +36837,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36614,7 +36846,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36643,6 +36875,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36652,6 +36885,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36662,6 +36896,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36671,6 +36906,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36680,6 +36916,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36717,17 +36954,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36795,8 +37033,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36804,7 +37042,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36833,6 +37071,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36842,6 +37081,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36852,6 +37092,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36861,6 +37102,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36870,6 +37112,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36906,17 +37149,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36983,8 +37227,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36992,7 +37236,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37021,6 +37265,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37030,6 +37275,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37040,6 +37286,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37049,6 +37296,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37058,6 +37306,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37094,17 +37343,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37171,8 +37421,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37180,7 +37430,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37209,6 +37459,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37218,6 +37469,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37228,6 +37480,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37237,6 +37490,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37246,6 +37500,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37285,17 +37540,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37365,8 +37621,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37374,7 +37630,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37403,6 +37659,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37412,6 +37669,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37422,6 +37680,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37431,6 +37690,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37440,6 +37700,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37476,17 +37737,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37553,8 +37815,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37562,7 +37824,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37591,6 +37853,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37600,6 +37863,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37610,6 +37874,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37619,6 +37884,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37628,6 +37894,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37665,17 +37932,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37743,8 +38011,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37752,7 +38020,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37781,6 +38049,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37790,6 +38059,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37800,6 +38070,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37809,6 +38080,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37818,6 +38090,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37856,17 +38129,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37935,8 +38209,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37944,7 +38218,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37973,6 +38247,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37982,6 +38257,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37992,6 +38268,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38001,6 +38278,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38010,6 +38288,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38046,17 +38325,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38123,8 +38403,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38132,7 +38412,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38161,6 +38441,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38170,6 +38451,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38180,6 +38462,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38189,6 +38472,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38198,6 +38482,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38234,17 +38519,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38311,8 +38597,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38320,7 +38606,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38349,6 +38635,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38358,6 +38645,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38368,6 +38656,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38377,6 +38666,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38386,6 +38676,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38422,17 +38713,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38499,8 +38791,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38508,7 +38800,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38537,6 +38829,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38546,6 +38839,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38556,6 +38850,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38565,6 +38860,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38574,6 +38870,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38610,17 +38907,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38687,8 +38985,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38696,7 +38994,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38725,6 +39023,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38734,6 +39033,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38744,6 +39044,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38753,6 +39054,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38762,6 +39064,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38798,17 +39101,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38875,8 +39179,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38884,7 +39188,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38913,6 +39217,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38922,6 +39227,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38932,6 +39238,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38941,6 +39248,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38950,6 +39258,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38986,17 +39295,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39063,8 +39373,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39072,7 +39382,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39101,6 +39411,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39110,6 +39421,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39120,6 +39432,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39129,6 +39442,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39138,6 +39452,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39174,17 +39489,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39251,8 +39567,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39260,7 +39576,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39289,6 +39605,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39298,6 +39615,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39308,6 +39626,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39317,6 +39636,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39326,6 +39646,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39362,17 +39683,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39439,8 +39761,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39448,7 +39770,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39477,6 +39799,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39486,6 +39809,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39496,6 +39820,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39505,6 +39830,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39514,6 +39840,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39553,17 +39880,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39630,8 +39958,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39639,7 +39967,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39673,6 +40001,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39682,6 +40011,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39692,6 +40022,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39701,6 +40032,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39710,6 +40042,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39746,17 +40079,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39823,8 +40157,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39832,7 +40166,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39861,6 +40195,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39870,6 +40205,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39880,6 +40216,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39889,6 +40226,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39898,6 +40236,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39937,17 +40276,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40014,8 +40354,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40023,7 +40363,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40057,6 +40397,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40066,6 +40407,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40076,6 +40418,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40085,6 +40428,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40094,6 +40438,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40130,17 +40475,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40207,8 +40553,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40216,7 +40562,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40245,6 +40591,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40254,6 +40601,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40264,6 +40612,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40273,6 +40622,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40282,6 +40632,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40318,17 +40669,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40395,8 +40747,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40404,7 +40756,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40433,6 +40785,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40442,6 +40795,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40452,6 +40806,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40461,6 +40816,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40470,6 +40826,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40506,17 +40863,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40583,8 +40941,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40592,7 +40950,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40621,6 +40979,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40630,6 +40989,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40640,6 +41000,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40649,6 +41010,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40658,6 +41020,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40697,17 +41060,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40774,8 +41138,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40783,7 +41147,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40817,6 +41181,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40826,6 +41191,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40836,6 +41202,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40845,6 +41212,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40854,6 +41222,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40893,17 +41262,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40970,8 +41340,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40979,7 +41349,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41013,6 +41383,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41022,6 +41393,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41032,6 +41404,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41041,6 +41414,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41050,6 +41424,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41086,17 +41461,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41163,8 +41539,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41172,7 +41548,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41201,6 +41577,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41210,6 +41587,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41220,6 +41598,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41229,6 +41608,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41238,6 +41618,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41274,17 +41655,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41351,8 +41733,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41360,7 +41742,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41389,6 +41771,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41398,6 +41781,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41408,6 +41792,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41417,6 +41802,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41426,6 +41812,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41462,17 +41849,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41539,8 +41927,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41548,7 +41936,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41577,6 +41965,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41586,6 +41975,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41596,6 +41986,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41605,6 +41996,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41614,6 +42006,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41650,17 +42043,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41727,8 +42121,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41736,7 +42130,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41765,6 +42159,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41774,6 +42169,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41784,6 +42180,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41793,6 +42190,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41802,6 +42200,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41838,17 +42237,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41915,8 +42315,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41924,7 +42324,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41953,6 +42353,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41962,6 +42363,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41972,6 +42374,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41981,6 +42384,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41990,6 +42394,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42026,17 +42431,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42103,8 +42509,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42112,7 +42518,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42141,6 +42547,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42150,6 +42557,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42160,6 +42568,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42169,6 +42578,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42178,6 +42588,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42215,17 +42626,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42293,8 +42705,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42302,7 +42714,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42331,6 +42743,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42340,6 +42753,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42350,6 +42764,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42359,6 +42774,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42368,6 +42784,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42407,17 +42824,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42487,8 +42905,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42496,7 +42914,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42525,6 +42943,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42534,6 +42953,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42544,6 +42964,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42553,6 +42974,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42562,6 +42984,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42604,17 +43027,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42687,8 +43111,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42696,7 +43120,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42725,6 +43149,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42734,6 +43159,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42744,6 +43170,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42753,6 +43180,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42762,6 +43190,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42804,17 +43233,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42887,8 +43317,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42896,7 +43326,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42925,6 +43355,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42934,6 +43365,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42944,6 +43376,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42953,6 +43386,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42962,6 +43396,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43004,17 +43439,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43087,8 +43523,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43096,7 +43532,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43125,6 +43561,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43134,6 +43571,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43144,6 +43582,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43153,6 +43592,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43162,6 +43602,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43201,17 +43642,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43281,8 +43723,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43290,7 +43732,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43319,6 +43761,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43328,6 +43771,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43338,6 +43782,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43347,6 +43792,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43356,6 +43802,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43398,17 +43845,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43481,8 +43929,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43490,7 +43938,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43519,6 +43967,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43528,6 +43977,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43538,6 +43988,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43547,6 +43998,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43556,6 +44008,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43598,17 +44051,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43681,8 +44135,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43690,7 +44144,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43719,6 +44173,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43728,6 +44183,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43738,6 +44194,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43747,6 +44204,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43756,6 +44214,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43798,17 +44257,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43881,8 +44341,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43890,7 +44350,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43919,6 +44379,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43928,6 +44389,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43938,6 +44400,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43947,6 +44410,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43956,6 +44420,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43992,17 +44457,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44069,8 +44535,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44078,7 +44544,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44107,6 +44573,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44116,6 +44583,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44126,6 +44594,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44135,6 +44604,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44144,6 +44614,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44183,17 +44654,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44263,8 +44735,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44272,7 +44744,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44301,6 +44773,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44310,6 +44783,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44320,6 +44794,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44329,6 +44804,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44338,6 +44814,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44374,17 +44851,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44451,8 +44929,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44460,7 +44938,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44489,6 +44967,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44498,6 +44977,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44508,6 +44988,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44517,6 +44998,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44526,6 +45008,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44568,17 +45051,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44651,8 +45135,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44660,7 +45144,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44689,6 +45173,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44698,6 +45183,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44708,6 +45194,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44717,6 +45204,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44726,6 +45214,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44764,17 +45253,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44843,8 +45333,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44852,7 +45342,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44881,6 +45371,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44890,6 +45381,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44900,6 +45392,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44909,6 +45402,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44918,6 +45412,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44954,17 +45449,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45031,8 +45527,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45040,7 +45536,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45069,6 +45565,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45078,6 +45575,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45088,6 +45586,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45097,6 +45596,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45106,6 +45606,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45144,17 +45645,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45223,8 +45725,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45232,7 +45734,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45261,6 +45763,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45270,6 +45773,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45280,6 +45784,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45289,6 +45794,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45298,6 +45804,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45339,17 +45846,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45421,8 +45929,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45430,7 +45938,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45459,6 +45967,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45468,6 +45977,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45478,6 +45988,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45487,6 +45998,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45496,6 +46008,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45532,17 +46045,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45609,8 +46123,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45618,7 +46132,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45647,6 +46161,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45656,6 +46171,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45666,6 +46182,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45675,6 +46192,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45684,6 +46202,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45720,17 +46239,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45797,8 +46317,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45806,7 +46326,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45835,6 +46355,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45844,6 +46365,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45854,6 +46376,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45863,6 +46386,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45872,6 +46396,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45908,17 +46433,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45985,8 +46511,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45994,7 +46520,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46023,6 +46549,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46032,6 +46559,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46042,6 +46570,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46051,6 +46580,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46060,6 +46590,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46098,17 +46629,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46177,8 +46709,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46186,7 +46718,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46215,6 +46747,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46224,6 +46757,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46234,6 +46768,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46243,6 +46778,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46252,6 +46788,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46293,17 +46830,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46375,8 +46913,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46384,7 +46922,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46413,6 +46951,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46422,6 +46961,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46432,6 +46972,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46441,6 +46982,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46450,6 +46992,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46486,17 +47029,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46563,8 +47107,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46572,7 +47116,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46601,6 +47145,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46610,6 +47155,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46620,6 +47166,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46629,6 +47176,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46638,6 +47186,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46687,17 +47236,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46777,8 +47327,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46786,7 +47336,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46815,6 +47365,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46824,6 +47375,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46834,6 +47386,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46843,6 +47396,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46852,6 +47406,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46888,17 +47443,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46965,8 +47521,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46974,7 +47530,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47003,6 +47559,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47012,6 +47569,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47022,6 +47580,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47031,6 +47590,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47040,6 +47600,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47076,17 +47637,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47153,8 +47715,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47162,7 +47724,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47191,6 +47753,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47200,6 +47763,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47210,6 +47774,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47219,6 +47784,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47228,6 +47794,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47275,17 +47842,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47363,8 +47931,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47372,7 +47940,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47401,6 +47969,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47410,6 +47979,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47420,6 +47990,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47429,6 +48000,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47438,6 +48010,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47474,17 +48047,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47551,8 +48125,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47560,7 +48134,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47589,6 +48163,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47598,6 +48173,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47608,6 +48184,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47617,6 +48194,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47626,6 +48204,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47670,17 +48249,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47755,8 +48335,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47764,7 +48344,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47793,6 +48373,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47802,6 +48383,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47812,6 +48394,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47821,6 +48404,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47830,6 +48414,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47870,17 +48455,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47951,8 +48537,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47960,7 +48546,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47989,6 +48575,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47998,6 +48585,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -48008,6 +48596,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48017,6 +48606,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -48026,6 +48616,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -48062,17 +48653,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -48139,8 +48731,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -48148,7 +48740,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -48177,6 +48769,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48186,6 +48779,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -48196,6 +48790,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48205,6 +48800,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -48214,6 +48810,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -48250,17 +48847,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -48327,8 +48925,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -48336,7 +48934,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -48365,6 +48963,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48374,6 +48973,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -48384,6 +48984,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48393,6 +48994,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -48402,6 +49004,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -48447,8 +49050,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48459,9 +49062,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48587,8 +49191,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48599,9 +49203,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48690,8 +49295,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48702,9 +49307,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48792,8 +49398,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48804,9 +49410,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48894,8 +49501,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48906,9 +49513,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48999,6 +49607,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -49029,6 +49638,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -49052,8 +49662,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49064,9 +49674,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49182,6 +49793,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -49212,6 +49824,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -49235,8 +49848,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49252,10 +49865,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49281,6 +49895,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -49357,17 +49972,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49448,17 +50064,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49539,17 +50156,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49636,8 +50254,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49648,9 +50266,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49739,8 +50358,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49751,9 +50370,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49841,8 +50461,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49853,9 +50473,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49944,8 +50565,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49956,9 +50577,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50047,8 +50669,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -50059,9 +50681,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50150,8 +50773,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -50162,9 +50785,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50247,17 +50871,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50341,17 +50966,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50433,17 +51059,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50594,8 +51221,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -50603,9 +51230,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTRERROR_R_RC_INT",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-Wno-incompatible-pointer-types-discards-qualifiers",
@@ -50674,17 +51302,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50756,17 +51385,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50977,6 +51607,13 @@
         "third_party/boringssl/src/crypto/rsa_extra/rsa_crypt.c",
         "third_party/boringssl/src/crypto/rsa_extra/rsa_print.c",
         "third_party/boringssl/src/crypto/siphash/siphash.c",
+        "third_party/boringssl/src/crypto/spx/address.c",
+        "third_party/boringssl/src/crypto/spx/fors.c",
+        "third_party/boringssl/src/crypto/spx/merkle.c",
+        "third_party/boringssl/src/crypto/spx/spx.c",
+        "third_party/boringssl/src/crypto/spx/spx_util.c",
+        "third_party/boringssl/src/crypto/spx/thash.c",
+        "third_party/boringssl/src/crypto/spx/wots.c",
         "third_party/boringssl/src/crypto/stack/stack.c",
         "third_party/boringssl/src/crypto/thread.c",
         "third_party/boringssl/src/crypto/thread_none.c",
@@ -51139,8 +51776,8 @@
         "-DBORINGSSL_ALLOW_CXX_RUNTIME",
         "-DBORINGSSL_IMPLEMENTATION",
         "-DBORINGSSL_NO_STATIC_INITIALIZER",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -51150,8 +51787,9 @@
         "-D_BORINGSSL_LIBPKI_",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-O2",
         "-fdata-sections",
         "-ffunction-sections",
         "-fno-asynchronous-unwind-tables",
@@ -51179,7 +51817,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -51188,7 +51826,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -51198,7 +51836,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -51207,7 +51845,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
         },
@@ -51216,7 +51854,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -51230,7 +51868,6 @@
                 "-D_FILE_OFFSET_BITS=64",
                 "-D_LARGEFILE64_SOURCE",
                 "-D_LARGEFILE_SOURCE",
-                "-O2",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -51387,8 +52024,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -51396,7 +52033,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -51427,6 +52064,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -51437,6 +52075,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -51448,6 +52087,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -51457,6 +52097,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -51467,6 +52108,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -51509,17 +52151,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -51597,17 +52240,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -51683,17 +52327,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -51763,17 +52408,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -51844,8 +52490,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DCOMPILER_GCC",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DHTML5_MODE",
@@ -51853,9 +52499,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -51925,8 +52572,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_STRONG_GETAUXVAL",
         "-DHAVE_SYS_UIO_H",
@@ -51935,9 +52582,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52034,8 +52682,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_STRONG_GETAUXVAL",
         "-DHAVE_SYS_UIO_H",
@@ -52044,9 +52692,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52140,8 +52789,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_STRONG_GETAUXVAL",
         "-DHAVE_SYS_UIO_H",
@@ -52150,9 +52799,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52226,8 +52876,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_STRONG_GETAUXVAL",
         "-DHAVE_SYS_UIO_H",
@@ -52236,9 +52886,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52331,8 +52982,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_GNU_POSIX_REGEX=0",
         "-DHAVE_POSIX_REGEX=0",
@@ -52342,9 +52993,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Dbenchmark_EXPORTS=1",
         "-Oz",
@@ -52427,6 +53079,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -52456,6 +53109,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -52478,8 +53132,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -52491,9 +53145,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52515,6 +53170,7 @@
         "third_party/googletest/src/googletest/include/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -52606,6 +53262,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -52635,6 +53292,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -52657,8 +53315,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -52670,9 +53328,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -52694,6 +53353,7 @@
         "third_party/googletest/src/googletest/include/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -53002,8 +53662,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_DLOPEN=0",
         "-DHAVE_SYS_UIO_H",
@@ -53012,6 +53672,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUCONFIG_ONLY_HTML_CONVERSION=1",
         "-DUCONFIG_USE_ML_PHRASE_BREAKING=1",
         "-DUCONFIG_USE_WINDOWS_LCID_MAPPING_API=0",
@@ -53025,7 +53686,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -53335,8 +53996,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_DLOPEN=0",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -53357,7 +54018,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -53388,6 +54049,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -53397,6 +54059,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -53407,6 +54070,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -53416,6 +54080,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -53425,6 +54090,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -53659,8 +54325,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_DLOPEN=0",
         "-DHAVE_SYS_UIO_H",
@@ -53669,6 +54335,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUCONFIG_ONLY_HTML_CONVERSION=1",
         "-DUCONFIG_USE_ML_PHRASE_BREAKING=1",
         "-DUCONFIG_USE_WINDOWS_LCID_MAPPING_API=0",
@@ -53683,7 +54350,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -53950,8 +54617,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_DLOPEN=0",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -53973,7 +54640,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -54004,6 +54671,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -54013,6 +54681,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -54023,6 +54692,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -54032,6 +54702,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -54041,6 +54712,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -54116,19 +54788,185 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
+// GN: //third_party/jni_zero:jni_zero_utils
+cc_library_static {
+    name: "cronet_aml_third_party_jni_zero_jni_zero_utils",
+    srcs: [
+        "third_party/jni_zero/logging.cc",
+    ],
+    shared_libs: [
+        "liblog",
+    ],
+    defaults: [
+        "cronet_aml_defaults",
+    ],
+    cflags: [
+        "-DANDROID",
+        "-DANDROID_NDK_VERSION_ROLL=r25c_1",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
+        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+        "-DHAVE_SYS_UIO_H",
+        "-DNDEBUG",
+        "-DNO_UNWIND_TABLES",
+        "-DNVALGRIND",
+        "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-D_GNU_SOURCE",
+        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
+        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D__STDC_CONSTANT_MACROS",
+        "-D__STDC_FORMAT_MACROS",
+        "-Oz",
+        "-fdata-sections",
+        "-ffunction-sections",
+        "-fno-asynchronous-unwind-tables",
+        "-fno-unwind-tables",
+        "-fvisibility-inlines-hidden",
+        "-fvisibility=hidden",
+        "-g1",
+    ],
+    local_include_dirs: [
+        "./",
+        "buildtools/third_party/libc++/",
+        "third_party/libc++/src/include",
+        "third_party/libc++abi/src/include",
+    ],
+    cpp_std: "c++20",
+    ldflags: [
+        "-Wl,--as-needed",
+        "-Wl,--gc-sections",
+        "-Wl,--icf=all",
+    ],
+    target: {
+        android_arm: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+            ],
+        },
+        android_arm64: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+                "-mno-outline",
+            ],
+        },
+        android_riscv64: {
+            cflags: [
+                "-fstack-protector",
+            ],
+        },
+        android_x86: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-msse3",
+            ],
+        },
+        android_x86_64: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+                "-msse3",
+            ],
+        },
+    },
+}
+
+// GN: //third_party/jni_zero:jni_zero_utils__testing
+cc_library_static {
+    name: "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
+    srcs: [
+        "third_party/jni_zero/logging.cc",
+    ],
+    shared_libs: [
+        "liblog",
+    ],
+    defaults: [
+        "cronet_aml_defaults",
+    ],
+    cflags: [
+        "-DANDROID",
+        "-DANDROID_NDK_VERSION_ROLL=r25c_1",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
+        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+        "-DHAVE_SYS_UIO_H",
+        "-DNDEBUG",
+        "-DNO_UNWIND_TABLES",
+        "-DNVALGRIND",
+        "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-D_GNU_SOURCE",
+        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
+        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D__STDC_CONSTANT_MACROS",
+        "-D__STDC_FORMAT_MACROS",
+        "-Oz",
+        "-fdata-sections",
+        "-ffunction-sections",
+        "-fno-asynchronous-unwind-tables",
+        "-fno-unwind-tables",
+        "-fvisibility-inlines-hidden",
+        "-fvisibility=hidden",
+        "-g1",
+    ],
+    local_include_dirs: [
+        "./",
+        "buildtools/third_party/libc++/",
+        "third_party/libc++/src/include",
+        "third_party/libc++abi/src/include",
+    ],
+    cpp_std: "c++20",
+    ldflags: [
+        "-Wl,--as-needed",
+        "-Wl,--gc-sections",
+        "-Wl,--icf=all",
+    ],
+    target: {
+        android_arm: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+            ],
+        },
+        android_arm64: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+                "-mno-outline",
+            ],
+        },
+        android_riscv64: {
+            cflags: [
+                "-fstack-protector",
+            ],
+        },
+        android_x86: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-msse3",
+            ],
+        },
+        android_x86_64: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+                "-msse3",
+            ],
+        },
+    },
+}
+
 // GN: //third_party/libevent:libevent
 cc_library_static {
     name: "cronet_aml_third_party_libevent_libevent",
     srcs: [
-        "third_party/libevent/buffer.c",
         "third_party/libevent/epoll.c",
-        "third_party/libevent/evbuffer.c",
-        "third_party/libevent/evdns.c",
         "third_party/libevent/event.c",
-        "third_party/libevent/event_tagging.c",
-        "third_party/libevent/evrpc.c",
         "third_party/libevent/evutil.c",
-        "third_party/libevent/http.c",
         "third_party/libevent/log.c",
         "third_party/libevent/poll.c",
         "third_party/libevent/select.c",
@@ -54141,8 +54979,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_CONFIG_H",
         "-DHAVE_SYS_UIO_H",
@@ -54150,9 +54988,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -54212,15 +55051,9 @@
 cc_library_static {
     name: "cronet_aml_third_party_libevent_libevent__testing",
     srcs: [
-        "third_party/libevent/buffer.c",
         "third_party/libevent/epoll.c",
-        "third_party/libevent/evbuffer.c",
-        "third_party/libevent/evdns.c",
         "third_party/libevent/event.c",
-        "third_party/libevent/event_tagging.c",
-        "third_party/libevent/evrpc.c",
         "third_party/libevent/evutil.c",
-        "third_party/libevent/http.c",
         "third_party/libevent/log.c",
         "third_party/libevent/poll.c",
         "third_party/libevent/select.c",
@@ -54232,8 +55065,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_CONFIG_H",
         "-DNDEBUG",
@@ -54242,7 +55075,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -54272,6 +55105,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
             local_include_dirs: [
@@ -54283,6 +55117,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -54295,6 +55130,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
             local_include_dirs: [
@@ -54306,6 +55142,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
             local_include_dirs: [
@@ -54317,6 +55154,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -54386,8 +55224,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -54395,6 +55233,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -54403,7 +55242,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D_REENTRANT",
         "-Oz",
@@ -54478,8 +55317,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -54487,6 +55326,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -54495,7 +55335,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -54574,8 +55414,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -54583,6 +55423,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -54591,7 +55432,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -54677,8 +55518,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -54689,9 +55530,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -54774,8 +55616,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -54786,9 +55628,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -55143,17 +55986,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -55224,8 +56068,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -55233,7 +56077,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -55263,6 +56107,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -55273,6 +56118,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -55284,6 +56130,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -55293,6 +56140,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -55303,6 +56151,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -55331,9 +56180,11 @@
 // GN: //third_party/netty4:netty_all_java__testing
 java_import {
     name: "cronet_aml_third_party_netty4_netty_all_java__testing",
-    defaults: [
-        "cronet_aml_defaults",
+    apex_available: [
+        "com.android.tethering",
     ],
+    min_sdk_version: "30",
+    sdk_version: "current",
     visibility: [
         "//external/cronet:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
@@ -55368,8 +56219,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_OPENSSL",
         "-DHAVE_SYS_UIO_H",
@@ -55377,9 +56228,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -55513,8 +56365,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -55534,7 +56386,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -55628,8 +56480,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -55649,7 +56501,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -55719,8 +56571,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -55732,7 +56584,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -55767,6 +56619,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -55775,6 +56628,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -55784,6 +56638,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -55792,6 +56647,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
         },
@@ -55800,6 +56656,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -55863,8 +56720,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -55876,7 +56733,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -55911,6 +56768,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -55919,6 +56777,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -55928,6 +56787,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -55936,6 +56796,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
         },
@@ -55944,6 +56805,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -55987,8 +56849,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -56007,7 +56869,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -56057,8 +56919,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -56077,7 +56939,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -56204,8 +57066,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -56224,7 +57086,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -56351,8 +57213,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -56371,7 +57233,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -56421,8 +57283,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -56433,9 +57295,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -56538,6 +57401,115 @@
     ],
 }
 
+// GN: //third_party/re2:re2__testing
+cc_library_static {
+    name: "cronet_aml_third_party_re2_re2__testing",
+    srcs: [
+        "third_party/re2/src/re2/bitmap256.cc",
+        "third_party/re2/src/re2/bitstate.cc",
+        "third_party/re2/src/re2/compile.cc",
+        "third_party/re2/src/re2/dfa.cc",
+        "third_party/re2/src/re2/filtered_re2.cc",
+        "third_party/re2/src/re2/mimics_pcre.cc",
+        "third_party/re2/src/re2/nfa.cc",
+        "third_party/re2/src/re2/onepass.cc",
+        "third_party/re2/src/re2/parse.cc",
+        "third_party/re2/src/re2/perl_groups.cc",
+        "third_party/re2/src/re2/prefilter.cc",
+        "third_party/re2/src/re2/prefilter_tree.cc",
+        "third_party/re2/src/re2/prog.cc",
+        "third_party/re2/src/re2/re2.cc",
+        "third_party/re2/src/re2/regexp.cc",
+        "third_party/re2/src/re2/set.cc",
+        "third_party/re2/src/re2/simplify.cc",
+        "third_party/re2/src/re2/tostring.cc",
+        "third_party/re2/src/re2/unicode_casefold.cc",
+        "third_party/re2/src/re2/unicode_groups.cc",
+        "third_party/re2/src/util/rune.cc",
+        "third_party/re2/src/util/strutil.cc",
+    ],
+    shared_libs: [
+        "liblog",
+    ],
+    generated_headers: [
+        "cronet_aml_build_chromeos_buildflags__testing",
+    ],
+    export_generated_headers: [
+        "cronet_aml_build_chromeos_buildflags__testing",
+    ],
+    defaults: [
+        "cronet_aml_defaults",
+    ],
+    cflags: [
+        "-DANDROID",
+        "-DANDROID_NDK_VERSION_ROLL=r25c_1",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
+        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+        "-DHAVE_SYS_UIO_H",
+        "-DNDEBUG",
+        "-DNO_UNWIND_TABLES",
+        "-DNVALGRIND",
+        "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-D_GNU_SOURCE",
+        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
+        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-Oz",
+        "-fdata-sections",
+        "-ffunction-sections",
+        "-fno-asynchronous-unwind-tables",
+        "-fno-unwind-tables",
+        "-fvisibility-inlines-hidden",
+        "-fvisibility=hidden",
+        "-g1",
+    ],
+    local_include_dirs: [
+        "./",
+        "buildtools/third_party/libc++/",
+        "third_party/abseil-cpp/",
+        "third_party/libc++/src/include",
+        "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
+    ],
+    cpp_std: "c++20",
+    ldflags: [
+        "-Wl,--as-needed",
+        "-Wl,--gc-sections",
+        "-Wl,--icf=all",
+    ],
+    target: {
+        android_arm: {
+            cflags: [
+                "-fstack-protector",
+            ],
+        },
+        android_arm64: {
+            cflags: [
+                "-fstack-protector",
+                "-mno-outline",
+            ],
+        },
+        android_riscv64: {
+            cflags: [
+                "-fstack-protector",
+            ],
+        },
+        android_x86: {
+            cflags: [
+                "-msse3",
+            ],
+        },
+        android_x86_64: {
+            cflags: [
+                "-fstack-protector",
+                "-msse3",
+            ],
+        },
+    },
+}
+
 // GN: //url:buildflags
 cc_genrule {
     name: "cronet_aml_url_buildflags",
@@ -56614,6 +57586,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -56626,21 +57599,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -56653,7 +57627,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags",
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -56663,21 +57637,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -56690,7 +57665,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags",
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -56698,8 +57673,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_URL_IMPL",
@@ -56707,9 +57682,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -56833,6 +57810,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -56850,7 +57828,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -56865,6 +57843,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -56882,7 +57861,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -56890,8 +57869,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_URL_IMPL",
@@ -56899,9 +57878,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -56984,7 +57965,7 @@
 java_library {
     name: "cronet_aml_url_url_java",
     srcs: [
-        ":cronet_aml_url_url_jni_headers__java",
+        ":cronet_aml_url_url_jni_headers__action__java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     static_libs: [
@@ -57002,7 +57983,7 @@
 java_library {
     name: "cronet_aml_url_url_java__testing",
     srcs: [
-        ":cronet_aml_url_url_jni_headers__testing__java",
+        ":cronet_aml_url_url_jni_headers__action__testing__java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     static_libs: [
@@ -57016,9 +57997,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //url:url_jni_headers
+// GN: //url:url_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_url_url_jni_headers",
+    name: "cronet_aml_url_url_jni_headers__action",
     srcs: [
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
@@ -57058,9 +58039,9 @@
     ],
 }
 
-// GN: //url:url_jni_headers
+// GN: //url:url_jni_headers__action
 java_genrule {
-    name: "cronet_aml_url_url_jni_headers__java",
+    name: "cronet_aml_url_url_jni_headers__action__java",
     srcs: [
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
@@ -57097,9 +58078,9 @@
     ],
 }
 
-// GN: //url:url_jni_headers__testing
+// GN: //url:url_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_url_url_jni_headers__testing",
+    name: "cronet_aml_url_url_jni_headers__action__testing",
     srcs: [
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
@@ -57137,9 +58118,9 @@
     ],
 }
 
-// GN: //url:url_jni_headers__testing
+// GN: //url:url_jni_headers__action__testing
 java_genrule {
-    name: "cronet_aml_url_url_jni_headers__testing__java",
+    name: "cronet_aml_url_url_jni_headers__action__testing__java",
     srcs: [
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
diff --git a/Android.extras.bp b/Android.extras.bp
index 4188867..ab64981 100644
--- a/Android.extras.bp
+++ b/Android.extras.bp
@@ -177,9 +177,6 @@
 android_library {
     name: "cronet_java_tests",
     manifest: "components/cronet/android/test/src/org/chromium/net/AndroidManifest.xml",
-    srcs: [
-        ":cronet_logger_tests_sources",
-    ],
     sdk_version: "module_current",
     min_sdk_version: "30",
     static_libs: [
@@ -187,10 +184,6 @@
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "cronet_aml_java__testing",
-        "cronet_experimental_options",
-        "cronet_rate_limiter",
-        "cronet_size_buckets",
-        "cronetstatslog_autogenerated_methods",
         "guava",
         "hamcrest-library",
         "junit",
@@ -212,102 +205,3 @@
     ],
 }
 
-// ------------------------------ TELEMETRY TARGETS --------------------------------------------
-
-genrule {
-  name: "statslog-cronet-java-gen",
-  tools: ["stats-log-api-gen"],
-  cmd: "$(location stats-log-api-gen) --java $(out) --module cronet --javaPackage android.net.http --javaClass CronetStatsLog",
-  out: ["android/net/http/CronetStatsLog.java"],
-}
-
-java_library {
-    name: "cronetstatslog_autogenerated_methods",
-    srcs: [
-        ":statslog-cronet-java-gen",
-    ],
-    libs: [
-        "framework-statsd",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "cronet_experimental_options",
-    srcs: [
-        "android/java/src/android/net/http/ExperimentalOptions.java",
-    ],
-    libs: [
-        "cronetstatslog_autogenerated_methods",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "cronet_rate_limiter",
-    srcs: [
-        "android/java/src/android/net/http/RateLimiter.java",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "cronet_size_buckets",
-    srcs: [
-        "android/java/src/android/net/http/SizeBuckets.java",
-    ],
-    libs: [
-        "cronetstatslog_autogenerated_methods",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "http_client_logging",
-    srcs: [
-        "android/java/src/android/net/http/CronetLoggerImpl.java",
-    ],
-    static_libs: [
-        "cronetstatslog_autogenerated_methods",
-        "cronet_experimental_options",
-        "cronet_rate_limiter",
-        "cronet_size_buckets",
-    ],
-    libs: [
-        "androidx.annotation_annotation",
-        "cronet_aml_java",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-    visibility: [
-        "//packages/modules/Connectivity:__subpackages__",
-    ],
-}
-
-filegroup {
-   name: "cronet_logger_tests_sources",
-   srcs: [
-        "android/javatests/src/android/net/http/SizeBucketsTest.java",
-        "android/javatests/src/android/net/http/RateLimiterTest.java",
-        "android/javatests/src/android/net/http/ExperimentalOptionsTest.java",
-    ],
-}
diff --git a/METADATA b/METADATA
index 9072e7c..5d0e4d4 100644
--- a/METADATA
+++ b/METADATA
@@ -8,5 +8,5 @@
     type: GIT
     value: "https://chromium.googlesource.com/chromium/src.git"
   }
-  version: "110.0.5481.154"
+  version: "121.0.6167.71"
 }
diff --git a/android/java/src/android/net/http/CronetLoggerImpl.java b/android/java/src/android/net/http/CronetLoggerImpl.java
deleted file mode 100644
index 142bcc4..0000000
--- a/android/java/src/android/net/http/CronetLoggerImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-import java.nio.ByteBuffer;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.chromium.net.impl.CronetLogger;
-
-/** Logger for logging cronet's telemetry */
-public class CronetLoggerImpl extends CronetLogger {
-  private static final String TAG = CronetLoggerImpl.class.getSimpleName();
-
-  private static final MessageDigest MD5_MESSAGE_DIGEST;
-
-  static {
-    MessageDigest messageDigest;
-    try {
-      messageDigest = MessageDigest.getInstance("MD5");
-    } catch (NoSuchAlgorithmException e) {
-      Log.d(TAG, "Error while instantiating messageDigest", e);
-      messageDigest = null;
-    }
-    MD5_MESSAGE_DIGEST = messageDigest;
-  }
-
-  private final AtomicInteger samplesRateLimited = new AtomicInteger();
-  private final RateLimiter rateLimiter;
-
-  public CronetLoggerImpl(int sampleRatePerSecond) {
-    this(new RateLimiter(sampleRatePerSecond));
-  }
-
-  @VisibleForTesting
-  public CronetLoggerImpl(RateLimiter rateLimiter) {
-    super();
-    this.rateLimiter = rateLimiter;
-  }
-
-  @Override
-  public void logCronetEngineCreation(
-      int cronetEngineId,
-      CronetEngineBuilderInfo builder,
-      CronetVersion version,
-      CronetSource source) {
-
-    if (builder == null || version == null || source == null) {
-      return;
-    }
-
-    writeCronetEngineCreation(cronetEngineId, builder, version, source);
-  }
-
-  @Override
-  public void logCronetTrafficInfo(int cronetEngineId, CronetTrafficInfo trafficInfo) {
-    if (trafficInfo == null) {
-      return;
-    }
-
-    if (!rateLimiter.tryAcquire()) {
-      samplesRateLimited.incrementAndGet();
-      return;
-    }
-
-    writeCronetTrafficReported(cronetEngineId, trafficInfo, samplesRateLimited.getAndSet(0));
-  }
-
-  @SuppressWarnings("CatchingUnchecked")
-  public void writeCronetEngineCreation(
-      long cronetEngineId,
-      CronetEngineBuilderInfo builder,
-      CronetVersion version,
-      CronetSource source) {
-
-    try {
-      // Parse experimental Options
-      ExperimentalOptions experimentalOptions =
-          new ExperimentalOptions(builder.getExperimentalOptions());
-
-      CronetStatsLog.write(
-          CronetStatsLog.CRONET_ENGINE_CREATED,
-          cronetEngineId,
-          version.getMajorVersion(),
-          version.getMinorVersion(),
-          version.getBuildVersion(),
-          version.getPatchVersion(),
-          convertToProtoCronetSource(source),
-          builder.isBrotliEnabled(),
-          builder.isHttp2Enabled(),
-          convertToProtoHttpCacheMode(builder.getHttpCacheMode()),
-          builder.isPublicKeyPinningBypassForLocalTrustAnchorsEnabled(),
-          builder.isQuicEnabled(),
-          builder.isNetworkQualityEstimatorEnabled(),
-          builder.getThreadPriority(),
-          // QUIC options
-          experimentalOptions.getConnectionOptionsOption(),
-          experimentalOptions.getStoreServerConfigsInPropertiesOption().getValue(),
-          experimentalOptions.getMaxServerConfigsStoredInPropertiesOption(),
-          experimentalOptions.getIdleConnectionTimeoutSecondsOption(),
-          experimentalOptions.getGoawaySessionsOnIpChangeOption().getValue(),
-          experimentalOptions.getCloseSessionsOnIpChangeOption().getValue(),
-          experimentalOptions.getMigrateSessionsOnNetworkChangeV2Option().getValue(),
-          experimentalOptions.getMigrateSessionsEarlyV2().getValue(),
-          experimentalOptions.getDisableBidirectionalStreamsOption().getValue(),
-          experimentalOptions.getMaxTimeBeforeCryptoHandshakeSecondsOption(),
-          experimentalOptions.getMaxIdleTimeBeforeCryptoHandshakeSecondsOption(),
-          experimentalOptions.getEnableSocketRecvOptimizationOption().getValue(),
-          // AsyncDNS
-          experimentalOptions.getAsyncDnsEnableOption().getValue(),
-          // StaleDNS
-          experimentalOptions.getStaleDnsEnableOption().getValue(),
-          experimentalOptions.getStaleDnsDelayMillisOption(),
-          experimentalOptions.getStaleDnsMaxExpiredTimeMillisOption(),
-          experimentalOptions.getStaleDnsMaxStaleUsesOption(),
-          experimentalOptions.getStaleDnsAllowOtherNetworkOption().getValue(),
-          experimentalOptions.getStaleDnsPersistToDiskOption().getValue(),
-          experimentalOptions.getStaleDnsPersistDelayMillisOption(),
-          experimentalOptions.getStaleDnsUseStaleOnNameNotResolvedOption().getValue(),
-          experimentalOptions.getDisableIpv6OnWifiOption().getValue(),
-          /* cronet_initialization_ref = */ -1);
-    } catch (Exception e) { // catching all exceptions since we don't want to crash the client
-      Log.d(
-          TAG,
-          String.format(
-              "Failed to log CronetEngine:%s creation: %s", cronetEngineId, e.getMessage()));
-    }
-  }
-
-  @SuppressWarnings("CatchingUnchecked")
-  @VisibleForTesting
-  public void writeCronetTrafficReported(
-      long cronetEngineId, CronetTrafficInfo trafficInfo, int samplesRateLimitedCount) {
-    try {
-      CronetStatsLog.write(
-          CronetStatsLog.CRONET_TRAFFIC_REPORTED,
-          cronetEngineId,
-          SizeBuckets.calcRequestHeadersSizeBucket(trafficInfo.getRequestHeaderSizeInBytes()),
-          SizeBuckets.calcRequestBodySizeBucket(trafficInfo.getRequestBodySizeInBytes()),
-          SizeBuckets.calcResponseHeadersSizeBucket(trafficInfo.getResponseHeaderSizeInBytes()),
-          SizeBuckets.calcResponseBodySizeBucket(trafficInfo.getResponseBodySizeInBytes()),
-          trafficInfo.getResponseStatusCode(),
-          hashNegotiatedProtocol(trafficInfo.getNegotiatedProtocol()),
-          (int) trafficInfo.getHeadersLatency().toMillis(),
-          (int) trafficInfo.getTotalLatency().toMillis(),
-          trafficInfo.wasConnectionMigrationAttempted(),
-          trafficInfo.didConnectionMigrationSucceed(),
-          samplesRateLimitedCount,
-          /* terminal_state = */ CronetStatsLog.CRONET_TRAFFIC_REPORTED__TERMINAL_STATE__STATE_UNKNOWN,
-          /* user_callback_exception_count = */ -1,
-          /* total_idle_time_millis = */ -1,
-          /* total_user_executor_execute_latency_millis = */ -1,
-          /* read_count = */ -1,
-          /* on_upload_read_count = */ -1,
-          /* is_bidi_stream = */ CronetStatsLog.CRONET_TRAFFIC_REPORTED__IS_BIDI_STREAM__UNSET); // 0 maps to UNKNOWN
-    } catch (Exception e) {
-      // using addAndGet because another thread might have modified samplesRateLimited's value
-      samplesRateLimited.addAndGet(samplesRateLimitedCount);
-      Log.d(
-          TAG,
-          String.format(
-              "Failed to log cronet traffic sample for CronetEngine %s: %s",
-              cronetEngineId, e.getMessage()));
-    }
-  }
-
-  private static int convertToProtoCronetSource(CronetSource source) {
-    switch (source) {
-      case CRONET_SOURCE_STATICALLY_LINKED:
-        return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_STATICALLY_LINKED;
-      case CRONET_SOURCE_PLAY_SERVICES:
-        return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_GMSCORE_DYNAMITE;
-      case CRONET_SOURCE_FALLBACK:
-        return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_FALLBACK;
-      case CRONET_SOURCE_UNSPECIFIED:
-        return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_UNSPECIFIED;
-    }
-    return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_UNSPECIFIED;
-  }
-
-  private static int convertToProtoHttpCacheMode(int httpCacheMode) {
-    switch (httpCacheMode) {
-      case 0:
-        return CronetStatsLog.CRONET_ENGINE_CREATED__HTTP_CACHE_MODE__HTTP_CACHE_DISABLED;
-      case 1:
-        return CronetStatsLog.CRONET_ENGINE_CREATED__HTTP_CACHE_MODE__HTTP_CACHE_DISK;
-      case 2:
-        return CronetStatsLog.CRONET_ENGINE_CREATED__HTTP_CACHE_MODE__HTTP_CACHE_DISK_NO_HTTP;
-      case 3:
-        return CronetStatsLog.CRONET_ENGINE_CREATED__HTTP_CACHE_MODE__HTTP_CACHE_IN_MEMORY;
-      default:
-        throw new IllegalArgumentException("Expected httpCacheMode to range from 0 to 3");
-    }
-  }
-
-  private static long hashNegotiatedProtocol(String protocol) {
-    if (MD5_MESSAGE_DIGEST == null || protocol == null || protocol.isEmpty()) {
-      return 0L;
-    }
-
-    byte[] md = MD5_MESSAGE_DIGEST.digest(protocol.getBytes(UTF_8));
-    return ByteBuffer.wrap(md).getLong();
-  }
-}
diff --git a/android/java/src/android/net/http/ExperimentalOptions.java b/android/java/src/android/net/http/ExperimentalOptions.java
deleted file mode 100644
index b467dd4..0000000
--- a/android/java/src/android/net/http/ExperimentalOptions.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http;
-
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Locale;
-import java.util.Set;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-/** Parses the experimentalOptions string */
-public final class ExperimentalOptions {
-  private static final String TAG = ExperimentalOptions.class.getSimpleName();
-
-  public static final int UNSET_INT_VALUE = -1;
-
-  // Declare static experimental options field trial names
-  private static final String QUIC = "QUIC";
-  private static final String ASYNC_DNS = "AsyncDNS";
-  private static final String STALE_DNS = "StaleDNS";
-
-  // The JSONObject created from the experimentalOptions String
-  private JSONObject json = new JSONObject();
-
-  public ExperimentalOptions(String experimentalOptions) {
-    if (!isNullOrEmpty(experimentalOptions)) {
-      try {
-        json = (JSONObject) new JSONTokener(experimentalOptions).nextValue();
-      } catch (JSONException | ClassCastException e) {
-        Log.d(
-            TAG,
-            String.format(
-                "Experimental options could not be parsed, using default values. Error: %s",
-                e.getMessage()));
-      }
-    }
-  }
-
-  public String getConnectionOptionsOption() {
-    return parseExperimentalOptionsString(
-        getOrDefault(QUIC, "connection_options", null, String.class));
-  }
-
-  public OptionalBoolean getStoreServerConfigsInPropertiesOption() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(QUIC, "store_server_configs_in_properties", null, Boolean.class));
-  }
-
-  public int getMaxServerConfigsStoredInPropertiesOption() {
-    return getOrDefault(
-        QUIC, "max_server_configs_stored_in_properties", UNSET_INT_VALUE, Integer.class);
-  }
-
-  @SuppressWarnings("GoodTime") // CronetStatsLog expects int
-  public int getIdleConnectionTimeoutSecondsOption() {
-    return getOrDefault(QUIC, "idle_connection_timeout_seconds", UNSET_INT_VALUE, Integer.class);
-  }
-
-  public OptionalBoolean getGoawaySessionsOnIpChangeOption() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(QUIC, "goaway_sessions_on_ip_change", null, Boolean.class));
-  }
-
-  public OptionalBoolean getCloseSessionsOnIpChangeOption() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(QUIC, "close_sessions_on_ip_change", null, Boolean.class));
-  }
-
-  public OptionalBoolean getMigrateSessionsOnNetworkChangeV2Option() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(QUIC, "migrate_sessions_on_network_change_v2", null, Boolean.class));
-  }
-
-  public OptionalBoolean getMigrateSessionsEarlyV2() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(QUIC, "migrate_sessions_early_v2", null, Boolean.class));
-  }
-
-  public OptionalBoolean getDisableBidirectionalStreamsOption() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(QUIC, "disable_bidirectional_streams", null, Boolean.class));
-  }
-
-  @SuppressWarnings("GoodTime") // CronetStatsLog expects int
-  public int getMaxTimeBeforeCryptoHandshakeSecondsOption() {
-    return getOrDefault(
-        QUIC, "max_time_before_crypto_handshake_seconds", UNSET_INT_VALUE, Integer.class);
-  }
-
-  @SuppressWarnings("GoodTime") // CronetStatsLog expects int
-  public int getMaxIdleTimeBeforeCryptoHandshakeSecondsOption() {
-    return getOrDefault(
-        QUIC, "max_idle_time_before_crypto_handshake_seconds", UNSET_INT_VALUE, Integer.class);
-  }
-
-  public OptionalBoolean getEnableSocketRecvOptimizationOption() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(QUIC, "enable_socket_recv_optimization", null, Boolean.class));
-  }
-
-  public OptionalBoolean getAsyncDnsEnableOption() {
-    return OptionalBoolean.fromBoolean(getOrDefault(ASYNC_DNS, "enable", null, Boolean.class));
-  }
-
-  public OptionalBoolean getStaleDnsEnableOption() {
-    return OptionalBoolean.fromBoolean(getOrDefault(STALE_DNS, "enable", null, Boolean.class));
-  }
-
-  @SuppressWarnings("GoodTime") // CronetStatsLog expects int
-  public int getStaleDnsDelayMillisOption() {
-    return getOrDefault(STALE_DNS, "delay_ms", UNSET_INT_VALUE, Integer.class);
-  }
-
-  @SuppressWarnings("GoodTime") // CronetStatsLog expects int
-  public int getStaleDnsMaxExpiredTimeMillisOption() {
-    return getOrDefault(STALE_DNS, "max_expired_time_ms", UNSET_INT_VALUE, Integer.class);
-  }
-
-  public int getStaleDnsMaxStaleUsesOption() {
-    return getOrDefault(STALE_DNS, "max_stale_uses", UNSET_INT_VALUE, Integer.class);
-  }
-
-  public OptionalBoolean getStaleDnsAllowOtherNetworkOption() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(STALE_DNS, "allow_other_network", null, Boolean.class));
-  }
-
-  public OptionalBoolean getStaleDnsPersistToDiskOption() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(STALE_DNS, "persist_to_disk", null, Boolean.class));
-  }
-
-  @SuppressWarnings("GoodTime") // CronetStatsLog expects int
-  public int getStaleDnsPersistDelayMillisOption() {
-    return getOrDefault(STALE_DNS, "persist_delay_ms", UNSET_INT_VALUE, Integer.class);
-  }
-
-  public OptionalBoolean getStaleDnsUseStaleOnNameNotResolvedOption() {
-    return OptionalBoolean.fromBoolean(
-        getOrDefault(STALE_DNS, "use_stale_on_name_not_resolved", null, Boolean.class));
-  }
-
-  public OptionalBoolean getDisableIpv6OnWifiOption() {
-    return OptionalBoolean.fromBoolean(getOrDefault("disable_ipv6_on_wifi", null, Boolean.class));
-  }
-
-  /**
-   * Checks if an experimentalOption fieldTrial key exists, then gets the value of the child option.
-   *
-   * @param experimentalOptionFieldTrialName the super option name for a nested experimental option
-   *     eg QUIC.connection_options where <code>QUIC</code> is the FieldTrialName and <code>
-   *     connection_options</code> is the child option
-   * @param option the child option eg <code>connection_options</code>
-   * @param defaultValue the defaultValue if the option is null or empty
-   * @return the experimental option value
-   */
-  private <T> T getOrDefault(
-      String experimentalOptionFieldTrialName, String option, T defaultValue, Class<T> clazz) {
-    // check if the field trial name exists
-    JSONObject options = null;
-    try {
-      options = json.getJSONObject(experimentalOptionFieldTrialName);
-    } catch (JSONException e) {
-      Log.d(
-          TAG,
-          String.format(
-              "Failed to get %s options: %s", experimentalOptionFieldTrialName, e.getMessage()));
-    }
-
-    if (options == null) {
-      return defaultValue;
-    }
-
-    T value = defaultValue;
-    try {
-      value = clazz.cast(options.get(option));
-    } catch (JSONException | ClassCastException e) {
-      Log.d(TAG, String.format("Failed to get %s options: %s", option, e.getMessage()));
-    }
-    return value;
-  }
-
-  private <T> T getOrDefault(String option, T defaultValue, Class<T> clazz) {
-    T value = defaultValue;
-    try {
-      value = clazz.cast(json.get(option));
-    } catch (JSONException | ClassCastException e) {
-      Log.d(TAG, String.format("Failed to get %s options: %s", option, e.getMessage()));
-    }
-    return value;
-  }
-
-  /**
-   * Checks that the connection_options options are always valid and do not contain any PII. Removes
-   * any value that does not conform to a valid option.
-   */
-  private String parseExperimentalOptionsString(String str) {
-    if (isNullOrEmpty(str)) {
-      return str;
-    }
-
-    ArrayList<String> nStr = new ArrayList<>();
-    for (String s : str.split(",", -1)) {
-      if (validConnectionOptions.contains(s.toUpperCase(Locale.ROOT).trim())) {
-        nStr.add(s);
-      }
-    }
-
-    return String.join(",", nStr);
-  }
-
-  /**
-   * The generated CronetStatsLog class has an optionalBoolean(UNSET,TRUE,FALSE) variable for each
-   * of the experimental options. Since these values will always be the same for the options, we
-   * picked one of them and used it to create a private variable that we can use to make the code
-   * more readable.
-   */
-  public static enum OptionalBoolean {
-    UNSET(
-        CronetStatsLog
-            .CRONET_ENGINE_CREATED__EXPERIMENTAL_OPTIONS_QUIC_STORE_SERVER_CONFIGS_IN_PROPERTIES__UNSET),
-    TRUE(
-        CronetStatsLog
-            .CRONET_ENGINE_CREATED__EXPERIMENTAL_OPTIONS_QUIC_STORE_SERVER_CONFIGS_IN_PROPERTIES__TRUE),
-    FALSE(
-        CronetStatsLog
-            .CRONET_ENGINE_CREATED__EXPERIMENTAL_OPTIONS_QUIC_STORE_SERVER_CONFIGS_IN_PROPERTIES__FALSE);
-
-    private final int value;
-
-    private OptionalBoolean(int value) {
-      this.value = value;
-    }
-
-    public int getValue() {
-      return value;
-    }
-
-    public static OptionalBoolean fromBoolean(Boolean value) {
-      if (value == null) {
-        return UNSET;
-      }
-
-      return value ? TRUE : FALSE;
-    }
-  }
-
-  private boolean isNullOrEmpty(String str) {
-    return str == null || str.isEmpty();
-  }
-
-  // Source: //external/cronet:net/third_party/quiche/src/quiche/quic/core/crypto/crypto_protocol.h
-  public static final Set<String> validConnectionOptions =
-      Set.of(
-          "CHLO", "SHLO", "SCFG", "REJ", "CETV", "PRST", "SCUP", "ALPN", "P256", "C255", "AESG",
-          "CC20", "QBIC", "AFCW", "IFW5", "IFW6", "IFW7", "IFW8", "IFW9", "IFWA", "TBBR", "1RTT",
-          "2RTT", "LRTT", "BBS1", "BBS2", "BBS3", "BBS4", "BBS5", "BBRR", "BBR1", "BBR2", "BBR3",
-          "BBR4", "BBR5", "BBR9", "BBRA", "BBRB", "BBRS", "BBQ1", "BBQ2", "BBQ3", "BBQ5", "BBQ6",
-          "BBQ7", "BBQ8", "BBQ9", "BBQ0", "RENO", "TPCC", "BYTE", "IW03", "IW10", "IW20", "IW50",
-          "B2ON", "B2NA", "B2NE", "B2RP", "B2LO", "B2HR", "B2SL", "B2H2", "B2RC", "BSAO", "B2DL",
-          "B201", "B202", "B203", "B204", "B205", "B206", "B207", "NTLP", "1TLP", "1RTO", "NRTO",
-          "TIME", "ATIM", "MIN1", "MIN4", "MAD0", "MAD2", "MAD3", "1ACK", "AKD3", "AKDU", "AFFE",
-          "AFF1", "AFF2", "SSLR", "NPRR", "2RTO", "3RTO", "4RTO", "5RTO", "6RTO", "CBHD", "NBHD",
-          "CONH", "LFAK", "STMP", "EACK", "ILD0", "ILD1", "ILD2", "ILD3", "ILD4", "RUNT", "NSTP",
-          "NRTT", "1PTO", "2PTO", "6PTO", "7PTO", "8PTO", "PTOS", "PTOA", "PEB1", "PEB2", "PVS1",
-          "PAG1", "PAG2", "PSDA", "PLE1", "PLE2", "APTO", "ELDT", "RVCM", "TCID", "MPTH", "NCMR",
-          "DFER", "NPCO", "BWRE", "BWMX", "BWID", "BWI1", "BWRS", "BWS2", "BWS3", "BWS4", "BWS5",
-          "BWS6", "BWP0", "BWP1", "BWP2", "BWP3", "BWP4", "BWG4", "BWG7", "BWG8", "BWS7", "BWM3",
-          "BWM4", "ICW1", "DTOS", "FIDT", "3AFF", "10AF", "MTUH", "MTUL", "NSLC", "NCHP", "NBPE",
-          "X509", "X59R", "CHID", "VER ", "NONC", "NONP", "KEXS", "AEAD", "COPT", "CLOP", "ICSL",
-          "MIBS", "MIUS", "ADE ", "IRTT", "TRTT", "SNI ", "PUBS", "SCID", "ORBT", "PDMD", "PROF",
-          "CCRT", "EXPY", "STTL", "SFCW", "CFCW", "UAID", "XLCT", "QLVE", "PDP1", "PDP2", "PDP3",
-          "PDP5", "QNZ2", "MAD", "IGNP", "SRWP", "ROWF", "ROWR", "GSR0", "GSR1", "GSR2", "GSR3",
-          "NRES", "INVC", "GWCH", "YTCH", "ACH0", "RREJ", "CADR", "ASAD", "SRST", "CIDK", "CIDS",
-          "RNON", "RSEQ", "PAD ", "EPID", "SNO0", "STK0", "CRT255", "CSCT");
-}
-
diff --git a/android/java/src/android/net/http/RateLimiter.java b/android/java/src/android/net/http/RateLimiter.java
deleted file mode 100644
index f4e412b..0000000
--- a/android/java/src/android/net/http/RateLimiter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http;
-
-import android.os.SystemClock;
-
-/**
- * This allows us to do ratelimiting based on the time difference between the last log action and
- * the current log action. This class allows us to specify the number of samples/second we want for
- * each request.
- */
-public final class RateLimiter {
-
-  private static final long ONE_SECOND_MILLIS = 1000L;
-
-  // The last tracked time
-  private final int samplesPerSeconds;
-  private int samplesLoggedDuringSecond = 0;
-  private long lastPermitMillis = Long.MIN_VALUE;
-
-  public RateLimiter(int samplesPerSeconds) {
-    if (samplesPerSeconds <= 0) {
-      throw new IllegalArgumentException("Expect sample rate to be > 0 sample(s) per second");
-    }
-
-    this.samplesPerSeconds = samplesPerSeconds;
-  }
-
-  // Check if rate limiting should happen based on a time passed or sample rate.
-  public synchronized boolean tryAcquire() {
-    long currentMillis = SystemClock.elapsedRealtime();
-
-    if (lastPermitMillis + ONE_SECOND_MILLIS <= currentMillis) {
-      // reset samplesLoggedDuringSecond and stopwatch once a second has passed
-      samplesLoggedDuringSecond = 1;
-      lastPermitMillis = currentMillis;
-      return true;
-    } else if (samplesLoggedDuringSecond < samplesPerSeconds) {
-      samplesLoggedDuringSecond++;
-      return true;
-    }
-    return false;
-  }
-}
diff --git a/android/java/src/android/net/http/SizeBuckets.java b/android/java/src/android/net/http/SizeBuckets.java
deleted file mode 100644
index 00580a9..0000000
--- a/android/java/src/android/net/http/SizeBuckets.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http;
-
-/** Utility class for grouping requests/responses into buckets */
-public final class SizeBuckets {
-
-  /**
-   * Accepts a value in Bytes and groups it in buckets based on the Kilobyte value;
-   *
-   * @param sizeBytes size in Bytes
-   * @return int bucket group
-   */
-  public static int calcRequestHeadersSizeBucket(long sizeBytes) {
-    checkSizeIsValid(sizeBytes, "Request header size is negative");
-
-    double sizeKB = sizeBytes / 1024.0;
-
-    if (isInClosedOpenRange(sizeKB, 0, 1)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_UNDER_ONE_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 1, 10)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_ONE_TO_TEN_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 10, 25)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_TEN_TO_TWENTY_FIVE_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 25, 50)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_TWENTY_FIVE_TO_FIFTY_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 50, 100)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_FIFTY_TO_HUNDRED_KIB;
-    } else { // sizeKB >= 100
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_OVER_HUNDRED_KIB;
-    }
-  }
-
-  /**
-   * Accepts a value in Bytes and groups it in buckets based on the Kilobyte value;
-   *
-   * @param sizeBytes size in Bytes
-   * @return int bucket group
-   */
-  public static int calcResponseHeadersSizeBucket(long sizeBytes) {
-    checkSizeIsValid(sizeBytes, "Response header size is negative");
-
-    double sizeKB = sizeBytes / 1024.0;
-
-    if (isInClosedOpenRange(sizeKB, 0, 1)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_UNDER_ONE_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 1, 10)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_ONE_TO_TEN_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 10, 25)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_TEN_TO_TWENTY_FIVE_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 25, 50)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_TWENTY_FIVE_TO_FIFTY_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 50, 100)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_FIFTY_TO_HUNDRED_KIB;
-    } else { // sizeKB >= 100
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_OVER_HUNDRED_KIB;
-    }
-  }
-
-  /**
-   * Accepts a value in Bytes and groups it in buckets based on the Kilobyte value;
-   *
-   * @param sizeBytes size in Bytes
-   * @return int bucket group
-   */
-  public static int calcRequestBodySizeBucket(long sizeBytes) {
-    checkSizeIsValid(sizeBytes, "Request body size is negative");
-
-    double sizeKB = sizeBytes / 1024.0;
-
-    if (sizeKB == 0) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_ZERO;
-    } else if (sizeKB > 0 && sizeKB < 10) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_UNDER_TEN_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 10, 50)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_TEN_TO_FIFTY_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 50, 200)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_FIFTY_TO_TWO_HUNDRED_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 200, 500)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_TWO_HUNDRED_TO_FIVE_HUNDRED_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 500, 1000)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_FIVE_HUNDRED_KIB_TO_ONE_MIB;
-    } else if (isInClosedOpenRange(sizeKB, 1000, 5000)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_ONE_TO_FIVE_MIB;
-    } else { // sizeKB >= 5000
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_OVER_FIVE_MIB;
-    }
-  }
-
-  /**
-   * Accepts a value in Bytes and groups it in buckets based on the Kilobyte value;
-   *
-   * @param sizeBytes size in Bytes
-   * @return int bucket group
-   */
-  public static int calcResponseBodySizeBucket(long sizeBytes) {
-    checkSizeIsValid(sizeBytes, "Response body size is negative");
-
-    double sizeKB = sizeBytes / 1024.0;
-
-    if (sizeKB == 0) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_ZERO;
-    } else if (sizeKB > 0 && sizeKB < 10) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_UNDER_TEN_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 10, 50)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_TEN_TO_FIFTY_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 50, 200)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_FIFTY_TO_TWO_HUNDRED_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 200, 500)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_TWO_HUNDRED_TO_FIVE_HUNDRED_KIB;
-    } else if (isInClosedOpenRange(sizeKB, 500, 1000)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_FIVE_HUNDRED_KIB_TO_ONE_MIB;
-    } else if (isInClosedOpenRange(sizeKB, 1000, 5000)) {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_ONE_TO_FIVE_MIB;
-    } else {
-      return CronetStatsLog
-          .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_OVER_FIVE_MIB;
-    }
-  }
-
-  private static void checkSizeIsValid(long sizeBytes, String errMessage) {
-    if (sizeBytes < 0) {
-      throw new IllegalArgumentException(errMessage);
-    }
-  }
-
-  private static boolean isInClosedOpenRange(double value, int lowerBound, int upperBound) {
-    return value >= lowerBound && value < upperBound;
-  }
-
-  private SizeBuckets() {}
-}
diff --git a/android/javatests/src/android/net/http/ExperimentalOptionsTest.java b/android/javatests/src/android/net/http/ExperimentalOptionsTest.java
deleted file mode 100644
index 137f017..0000000
--- a/android/javatests/src/android/net/http/ExperimentalOptionsTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http;
-
-import static com.google.common.truth.Truth.assertThat;
-import static android.net.http.ExperimentalOptions.UNSET_INT_VALUE;
-import static android.net.http.ExperimentalOptions.validConnectionOptions;
-import static org.junit.Assert.assertEquals;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.common.base.Splitter;
-import android.net.http.ExperimentalOptions.OptionalBoolean;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public final class ExperimentalOptionsTest {
-
-  // Some random numbers to test with
-  private static final int TEST_VALUE = 2;
-  private static final String CONN_STRING = "CHLO,IW10";
-
-  @Test
-  public void testExperimentalOptionsConnectionoptions_shouldConsistofCommaSeparatedStringofChars()
-      throws JSONException {
-    // QUIC connection options are represented with a comma separated list of {3,4}-char strings eg
-    // 'ABCD, EFGH'
-    JSONObject quicExperiment =
-        new JSONObject().put("connection_options", "|we/3," + CONN_STRING + ",bbra@google.com");
-    JSONObject experimentalOptions = new JSONObject().put("QUIC", quicExperiment);
-    ExperimentalOptions options = new ExperimentalOptions(experimentalOptions.toString());
-
-    String connectionOptions = options.getConnectionOptionsOption();
-    Iterable<String> optionsArray = Splitter.on(',').split(connectionOptions);
-
-    assertEquals(CONN_STRING, connectionOptions);
-    for (String option : optionsArray) {
-      assertThat(validConnectionOptions).contains(option);
-    }
-  }
-
-  @Test
-  public void testNullString_shouldUseUnsetValues() {
-    ExperimentalOptions option = new ExperimentalOptions("");
-
-    assertThat(option.getConnectionOptionsOption()).isNull();
-    assertEquals(OptionalBoolean.UNSET, option.getStoreServerConfigsInPropertiesOption());
-    assertEquals(UNSET_INT_VALUE, option.getMaxServerConfigsStoredInPropertiesOption());
-    assertEquals(UNSET_INT_VALUE, option.getIdleConnectionTimeoutSecondsOption());
-    assertEquals(OptionalBoolean.UNSET, option.getGoawaySessionsOnIpChangeOption());
-    assertEquals(OptionalBoolean.UNSET, option.getCloseSessionsOnIpChangeOption());
-    assertEquals(OptionalBoolean.UNSET, option.getMigrateSessionsOnNetworkChangeV2Option());
-    assertEquals(OptionalBoolean.UNSET, option.getMigrateSessionsEarlyV2());
-    assertEquals(OptionalBoolean.UNSET, option.getDisableBidirectionalStreamsOption());
-    assertEquals(UNSET_INT_VALUE, option.getMaxTimeBeforeCryptoHandshakeSecondsOption());
-    assertEquals(UNSET_INT_VALUE, option.getMaxIdleTimeBeforeCryptoHandshakeSecondsOption());
-    assertEquals(OptionalBoolean.UNSET, option.getEnableSocketRecvOptimizationOption());
-    assertEquals(OptionalBoolean.UNSET, option.getAsyncDnsEnableOption());
-    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsEnableOption());
-    assertEquals(UNSET_INT_VALUE, option.getStaleDnsDelayMillisOption());
-    assertEquals(UNSET_INT_VALUE, option.getStaleDnsMaxExpiredTimeMillisOption());
-    assertEquals(UNSET_INT_VALUE, option.getStaleDnsMaxStaleUsesOption());
-    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsAllowOtherNetworkOption());
-    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsPersistToDiskOption());
-    assertEquals(UNSET_INT_VALUE, option.getStaleDnsPersistDelayMillisOption());
-    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsUseStaleOnNameNotResolvedOption());
-    assertEquals(OptionalBoolean.UNSET, option.getDisableIpv6OnWifiOption());
-  }
-
-  @Test
-  public void testInvalidString_shouldUseUnsetValues() {
-    ExperimentalOptions option = new ExperimentalOptions("blah");
-
-    assertThat(option.getConnectionOptionsOption()).isNull();
-    assertEquals(OptionalBoolean.UNSET, option.getStoreServerConfigsInPropertiesOption());
-    assertEquals(UNSET_INT_VALUE, option.getMaxServerConfigsStoredInPropertiesOption());
-    assertEquals(UNSET_INT_VALUE, option.getIdleConnectionTimeoutSecondsOption());
-    assertEquals(OptionalBoolean.UNSET, option.getGoawaySessionsOnIpChangeOption());
-    assertEquals(OptionalBoolean.UNSET, option.getCloseSessionsOnIpChangeOption());
-    assertEquals(OptionalBoolean.UNSET, option.getMigrateSessionsOnNetworkChangeV2Option());
-    assertEquals(OptionalBoolean.UNSET, option.getMigrateSessionsEarlyV2());
-    assertEquals(OptionalBoolean.UNSET, option.getDisableBidirectionalStreamsOption());
-    assertEquals(UNSET_INT_VALUE, option.getMaxTimeBeforeCryptoHandshakeSecondsOption());
-    assertEquals(UNSET_INT_VALUE, option.getMaxIdleTimeBeforeCryptoHandshakeSecondsOption());
-    assertEquals(OptionalBoolean.UNSET, option.getEnableSocketRecvOptimizationOption());
-    assertEquals(OptionalBoolean.UNSET, option.getAsyncDnsEnableOption());
-    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsEnableOption());
-    assertEquals(UNSET_INT_VALUE, option.getStaleDnsDelayMillisOption());
-    assertEquals(UNSET_INT_VALUE, option.getStaleDnsMaxExpiredTimeMillisOption());
-    assertEquals(UNSET_INT_VALUE, option.getStaleDnsMaxStaleUsesOption());
-    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsAllowOtherNetworkOption());
-    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsPersistToDiskOption());
-    assertEquals(UNSET_INT_VALUE, option.getStaleDnsPersistDelayMillisOption());
-    assertEquals(OptionalBoolean.UNSET, option.getStaleDnsUseStaleOnNameNotResolvedOption());
-    assertEquals(OptionalBoolean.UNSET, option.getDisableIpv6OnWifiOption());
-  }
-
-  @Test
-  public void testSetToTrueOptions_shouldUseSetValues() throws JSONException {
-    ExperimentalOptions option = generateExperimentalValuesWith(true);
-
-    assertEquals(OptionalBoolean.TRUE, option.getStoreServerConfigsInPropertiesOption());
-    assertEquals(TEST_VALUE, option.getMaxServerConfigsStoredInPropertiesOption());
-    assertEquals(TEST_VALUE, option.getIdleConnectionTimeoutSecondsOption());
-    assertEquals(OptionalBoolean.TRUE, option.getGoawaySessionsOnIpChangeOption());
-    assertEquals(OptionalBoolean.TRUE, option.getCloseSessionsOnIpChangeOption());
-    assertEquals(OptionalBoolean.TRUE, option.getMigrateSessionsOnNetworkChangeV2Option());
-    assertEquals(OptionalBoolean.TRUE, option.getMigrateSessionsEarlyV2());
-    assertEquals(OptionalBoolean.TRUE, option.getDisableBidirectionalStreamsOption());
-    assertEquals(TEST_VALUE, option.getMaxTimeBeforeCryptoHandshakeSecondsOption());
-    assertEquals(TEST_VALUE, option.getMaxIdleTimeBeforeCryptoHandshakeSecondsOption());
-    assertEquals(OptionalBoolean.TRUE, option.getEnableSocketRecvOptimizationOption());
-    assertEquals(OptionalBoolean.TRUE, option.getAsyncDnsEnableOption());
-    assertEquals(OptionalBoolean.TRUE, option.getStaleDnsEnableOption());
-    assertEquals(TEST_VALUE, option.getStaleDnsDelayMillisOption());
-    assertEquals(TEST_VALUE, option.getStaleDnsMaxExpiredTimeMillisOption());
-    assertEquals(TEST_VALUE, option.getStaleDnsMaxStaleUsesOption());
-    assertEquals(OptionalBoolean.TRUE, option.getStaleDnsAllowOtherNetworkOption());
-    assertEquals(OptionalBoolean.TRUE, option.getStaleDnsPersistToDiskOption());
-    assertEquals(TEST_VALUE, option.getStaleDnsPersistDelayMillisOption());
-    assertEquals(OptionalBoolean.TRUE, option.getStaleDnsUseStaleOnNameNotResolvedOption());
-    assertEquals(OptionalBoolean.TRUE, option.getDisableIpv6OnWifiOption());
-  }
-
-  @Test
-  public void testSetToFalseOptions_shouldUseFalseValues() throws JSONException {
-    ExperimentalOptions option = generateExperimentalValuesWith(false);
-
-    assertEquals(OptionalBoolean.FALSE, option.getStoreServerConfigsInPropertiesOption());
-    assertEquals(OptionalBoolean.FALSE, option.getGoawaySessionsOnIpChangeOption());
-    assertEquals(OptionalBoolean.FALSE, option.getCloseSessionsOnIpChangeOption());
-    assertEquals(OptionalBoolean.FALSE, option.getMigrateSessionsOnNetworkChangeV2Option());
-    assertEquals(OptionalBoolean.FALSE, option.getMigrateSessionsEarlyV2());
-    assertEquals(OptionalBoolean.FALSE, option.getDisableBidirectionalStreamsOption());
-    assertEquals(OptionalBoolean.FALSE, option.getEnableSocketRecvOptimizationOption());
-    assertEquals(OptionalBoolean.FALSE, option.getAsyncDnsEnableOption());
-    assertEquals(OptionalBoolean.FALSE, option.getStaleDnsEnableOption());
-    assertEquals(OptionalBoolean.FALSE, option.getStaleDnsAllowOtherNetworkOption());
-    assertEquals(OptionalBoolean.FALSE, option.getStaleDnsPersistToDiskOption());
-    assertEquals(OptionalBoolean.FALSE, option.getStaleDnsUseStaleOnNameNotResolvedOption());
-    assertEquals(OptionalBoolean.FALSE, option.getDisableIpv6OnWifiOption());
-  }
-
-  private ExperimentalOptions generateExperimentalValuesWith(Boolean value) throws JSONException {
-    JSONObject quicExperiment =
-        new JSONObject()
-            .put("connection_options", "")
-            .put("store_server_configs_in_properties", value)
-            .put("goaway_sessions_on_ip_change", value)
-            .put("close_sessions_on_ip_change", value)
-            .put("migrate_sessions_on_network_change_v2", value)
-            .put("migrate_sessions_early_v2", value)
-            .put("disable_bidirectional_streams", value)
-            .put("enable_socket_recv_optimization", value);
-    JSONObject asyncDNS = new JSONObject().put("enable", value);
-    JSONObject staleDNS =
-        new JSONObject()
-            .put("enable", value)
-            .put("allow_other_network", value)
-            .put("persist_to_disk", value)
-            .put("use_stale_on_name_not_resolved", value);
-
-    // add the integer values if needed
-    if (value) {
-      quicExperiment
-          .put("connection_options", CONN_STRING)
-          .put("max_server_configs_stored_in_properties", TEST_VALUE)
-          .put("idle_connection_timeout_seconds", TEST_VALUE)
-          .put("max_time_before_crypto_handshake_seconds", TEST_VALUE)
-          .put("max_idle_time_before_crypto_handshake_seconds", TEST_VALUE);
-
-      staleDNS
-          .put("delay_ms", TEST_VALUE)
-          .put("max_expired_time_ms", TEST_VALUE)
-          .put("max_stale_uses", TEST_VALUE)
-          .put("persist_delay_ms", TEST_VALUE);
-    }
-
-    JSONObject options =
-        new JSONObject()
-            .put("QUIC", quicExperiment)
-            .put("AsyncDNS", asyncDNS)
-            .put("StaleDNS", staleDNS)
-            .put("disable_ipv6_on_wifi", value);
-
-    return new ExperimentalOptions(options.toString());
-  }
-}
diff --git a/android/javatests/src/android/net/http/RateLimiterTest.java b/android/javatests/src/android/net/http/RateLimiterTest.java
deleted file mode 100644
index 8e05662..0000000
--- a/android/javatests/src/android/net/http/RateLimiterTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import java.time.Duration;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public final class RateLimiterTest {
-
-  @Test
-  public void testImmediateRateLimit() {
-    RateLimiter rateLimiter = new RateLimiter(1);
-    assertTrue("First request was rate limited", rateLimiter.tryAcquire());
-    assertFalse("Second request was not rate limited", rateLimiter.tryAcquire());
-  }
-
-  @Test
-  public void testInvalidSamplePerSecond() {
-    int samplesPerSecond = -1;
-    assertThrows(
-        "samples per second was negative",
-        IllegalArgumentException.class,
-        () -> new RateLimiter(samplesPerSecond));
-  }
-}
-
diff --git a/android/javatests/src/android/net/http/SizeBucketsTest.java b/android/javatests/src/android/net/http/SizeBucketsTest.java
deleted file mode 100644
index 0f309fa..0000000
--- a/android/javatests/src/android/net/http/SizeBucketsTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public final class SizeBucketsTest {
-
-  private static final long INVALID = -1L;
-  private static final long ZERO = 0L;
-  private static final long ONE_KB_IN_BYTES = 1024L;
-  private static final long FIFTY_KB_IN_BYTES = 50L * ONE_KB_IN_BYTES;
-  private static final long TWO_HUNDRED_KB_IN_BYTES = 200L * ONE_KB_IN_BYTES;
-  private static final long ONE_THOUSAND_KB_IN_BYTES = 1000L * ONE_KB_IN_BYTES;
-  private static final long FIVE_THOUSAND_KB_IN_BYTES = 5000L * ONE_KB_IN_BYTES;
-
-  @Test
-  public void calcRequestHeadersSizeBucket_validInput_shouldReturnTheRightBucketSize() {
-    assertEquals(
-        CronetStatsLog
-            .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_UNDER_ONE_KIB,
-        SizeBuckets.calcRequestHeadersSizeBucket(ZERO));
-    assertEquals(
-        CronetStatsLog
-            .CRONET_TRAFFIC_REPORTED__REQUEST_HEADERS_SIZE__REQUEST_HEADERS_SIZE_BUCKET_OVER_HUNDRED_KIB,
-        SizeBuckets.calcRequestHeadersSizeBucket(TWO_HUNDRED_KB_IN_BYTES));
-  }
-
-  @Test
-  public void calcResponseHeadersSizeBucket_validInput_shouldReturnTheRightBucketSize() {
-    assertEquals(
-        CronetStatsLog
-            .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_ONE_TO_TEN_KIB,
-        SizeBuckets.calcResponseHeadersSizeBucket(ONE_KB_IN_BYTES));
-    assertEquals(
-        CronetStatsLog
-            .CRONET_TRAFFIC_REPORTED__RESPONSE_HEADERS_SIZE__RESPONSE_HEADERS_SIZE_BUCKET_FIFTY_TO_HUNDRED_KIB,
-        SizeBuckets.calcResponseHeadersSizeBucket(FIFTY_KB_IN_BYTES));
-  }
-
-  @Test
-  public void calcRequestBodySizeBucket_validInput_shouldReturnTheRightBucketSize() {
-    assertEquals(
-        CronetStatsLog.CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_ZERO,
-        SizeBuckets.calcRequestBodySizeBucket(ZERO));
-    assertEquals(
-        CronetStatsLog
-            .CRONET_TRAFFIC_REPORTED__REQUEST_BODY_SIZE__REQUEST_BODY_SIZE_BUCKET_OVER_FIVE_MIB,
-        SizeBuckets.calcRequestBodySizeBucket(FIVE_THOUSAND_KB_IN_BYTES));
-  }
-
-  @Test
-  public void calcResponseBodySizeBucket_validInput_shouldReturnTheRightBucketSize() {
-    assertEquals(
-        CronetStatsLog
-            .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_UNDER_TEN_KIB,
-        SizeBuckets.calcResponseBodySizeBucket(ONE_KB_IN_BYTES));
-    assertEquals(
-        CronetStatsLog
-            .CRONET_TRAFFIC_REPORTED__RESPONSE_BODY_SIZE__RESPONSE_BODY_SIZE_BUCKET_ONE_TO_FIVE_MIB,
-        SizeBuckets.calcResponseBodySizeBucket(ONE_THOUSAND_KB_IN_BYTES));
-  }
-
-  @Test
-  public void calcSizeBucket_invalidInput_shouldThrow() {
-    assertThrows(
-        IllegalArgumentException.class, () -> SizeBuckets.calcRequestBodySizeBucket(INVALID));
-    assertThrows(
-        IllegalArgumentException.class, () -> SizeBuckets.calcRequestHeadersSizeBucket(INVALID));
-    assertThrows(
-        IllegalArgumentException.class, () -> SizeBuckets.calcRequestBodySizeBucket(INVALID));
-    assertThrows(
-        IllegalArgumentException.class, () -> SizeBuckets.calcResponseHeadersSizeBucket(INVALID));
-  }
-}
-
diff --git a/android/tools/gn2bp/Android.bp.swp b/android/tools/gn2bp/Android.bp.swp
index 0c634f6..8e5dbcb 100644
--- a/android/tools/gn2bp/Android.bp.swp
+++ b/android/tools/gn2bp/Android.bp.swp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// This file is automatically generated by gn2bp/gen_android_bp. Do not edit.
+// This file is automatically generated by gen_android_bp. Do not edit.
 
 build = ["Android.extras.bp"]
 
@@ -125,8 +125,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_PARTITION_ALLOC_BASE_IMPL",
@@ -134,9 +134,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -243,8 +244,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DIS_PARTITION_ALLOC_BASE_IMPL",
         "-DNDEBUG",
@@ -253,7 +254,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -292,6 +293,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -308,6 +310,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -325,6 +328,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -340,6 +344,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -356,6 +361,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -435,8 +441,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAS_PR_MTE_MACROS",
         "-DHAVE_SYS_UIO_H",
@@ -445,9 +451,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -562,8 +569,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DIS_PARTITION_ALLOC_IMPL",
         "-DNDEBUG",
@@ -572,7 +579,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -605,6 +612,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -618,6 +626,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-march=armv8-a+memtag",
@@ -633,6 +642,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
             local_include_dirs: [
@@ -645,6 +655,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -658,6 +669,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAS_PR_MTE_MACROS",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -711,18 +723,19 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
-        "-DIS_PARTITION_ALLOC_IMPL",
+        "-DIS_ALLOCATOR_SHIM_IMPL",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -823,17 +836,17 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
-        "-DIS_PARTITION_ALLOC_IMPL",
+        "-DIS_ALLOCATOR_SHIM_IMPL",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -868,6 +881,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -897,6 +911,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -927,6 +942,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
             ldflags: [
@@ -955,6 +971,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -984,6 +1001,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -1042,6 +1060,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/chromecast_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1066,6 +1087,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/chromecast_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1089,6 +1113,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/chromeos_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1113,6 +1140,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/chromeos_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1187,6 +1217,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/debugging_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1274,6 +1307,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/debugging_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1282,327 +1318,6 @@
     ],
 }
 
-// GN: //base/allocator/partition_allocator/src/partition_alloc:partition_alloc
-cc_library_static {
-    name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc",
-    generated_headers: [
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
-    ],
-    export_generated_headers: [
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DANDROID",
-        "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
-        "-DHAVE_SYS_UIO_H",
-        "-DNDEBUG",
-        "-DNO_UNWIND_TABLES",
-        "-DNVALGRIND",
-        "-DOFFICIAL_BUILD",
-        "-D_GNU_SOURCE",
-        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
-        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D__STDC_CONSTANT_MACROS",
-        "-D__STDC_FORMAT_MACROS",
-        "-Oz",
-        "-fdata-sections",
-        "-ffunction-sections",
-        "-fno-asynchronous-unwind-tables",
-        "-fno-unwind-tables",
-        "-fvisibility-inlines-hidden",
-        "-fvisibility=hidden",
-        "-g1",
-    ],
-    local_include_dirs: [
-        "./",
-        "base/allocator/partition_allocator/src/",
-        "buildtools/third_party/libc++/",
-        "third_party/libc++/src/include",
-        "third_party/libc++abi/src/include",
-    ],
-    cpp_std: "c++20",
-    ldflags: [
-        "-Wl,--as-needed",
-        "-Wl,--gc-sections",
-        "-Wl,--icf=all",
-        "-Wl,-wrap,asprintf",
-        "-Wl,-wrap,calloc",
-        "-Wl,-wrap,free",
-        "-Wl,-wrap,getcwd",
-        "-Wl,-wrap,malloc",
-        "-Wl,-wrap,malloc_usable_size",
-        "-Wl,-wrap,memalign",
-        "-Wl,-wrap,posix_memalign",
-        "-Wl,-wrap,pvalloc",
-        "-Wl,-wrap,realloc",
-        "-Wl,-wrap,realpath",
-        "-Wl,-wrap,strdup",
-        "-Wl,-wrap,strndup",
-        "-Wl,-wrap,valloc",
-        "-Wl,-wrap,vasprintf",
-    ],
-    target: {
-        android_arm: {
-            cflags: [
-                "-D_FORTIFY_SOURCE=2",
-                "-fstack-protector",
-            ],
-        },
-        android_arm64: {
-            cflags: [
-                "-D_FORTIFY_SOURCE=2",
-                "-fstack-protector",
-                "-mno-outline",
-            ],
-        },
-        android_riscv64: {
-            cflags: [
-                "-fstack-protector",
-            ],
-        },
-        android_x86: {
-            cflags: [
-                "-D_FORTIFY_SOURCE=2",
-                "-msse3",
-            ],
-        },
-        android_x86_64: {
-            cflags: [
-                "-D_FORTIFY_SOURCE=2",
-                "-fstack-protector",
-                "-msse3",
-            ],
-        },
-    },
-}
-
-// GN: //base/allocator/partition_allocator/src/partition_alloc:partition_alloc__testing
-cc_library_static {
-    name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
-    host_supported: true,
-    generated_headers: [
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags__testing",
-    ],
-    export_generated_headers: [
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags__testing",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
-        "-DNDEBUG",
-        "-DNO_UNWIND_TABLES",
-        "-DNVALGRIND",
-        "-DOFFICIAL_BUILD",
-        "-D_GNU_SOURCE",
-        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
-        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D__STDC_CONSTANT_MACROS",
-        "-D__STDC_FORMAT_MACROS",
-        "-fdata-sections",
-        "-ffunction-sections",
-        "-fno-asynchronous-unwind-tables",
-        "-fno-unwind-tables",
-        "-fvisibility-inlines-hidden",
-        "-fvisibility=hidden",
-        "-g1",
-    ],
-    local_include_dirs: [
-        "./",
-        "base/allocator/partition_allocator/src/",
-        "buildtools/third_party/libc++/",
-        "third_party/libc++/src/include",
-        "third_party/libc++abi/src/include",
-    ],
-    cpp_std: "c++20",
-    ldflags: [
-        "-Wl,--as-needed",
-        "-Wl,--gc-sections",
-        "-Wl,--icf=all",
-    ],
-    target: {
-        android_arm: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-D_FORTIFY_SOURCE=2",
-                "-Oz",
-                "-fstack-protector",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        android_arm64: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-D_FORTIFY_SOURCE=2",
-                "-Oz",
-                "-fstack-protector",
-                "-mno-outline",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        android_riscv64: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-Oz",
-                "-fstack-protector",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        android_x86: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-D_FORTIFY_SOURCE=2",
-                "-Oz",
-                "-msse3",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        android_x86_64: {
-            cflags: [
-                "-DANDROID",
-                "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-                "-DHAVE_SYS_UIO_H",
-                "-D_FORTIFY_SOURCE=2",
-                "-Oz",
-                "-fstack-protector",
-                "-msse3",
-            ],
-            ldflags: [
-                "-Wl,-wrap,asprintf",
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,getcwd",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,malloc_usable_size",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,posix_memalign",
-                "-Wl,-wrap,pvalloc",
-                "-Wl,-wrap,realloc",
-                "-Wl,-wrap,realpath",
-                "-Wl,-wrap,strdup",
-                "-Wl,-wrap,strndup",
-                "-Wl,-wrap,valloc",
-                "-Wl,-wrap,vasprintf",
-            ],
-        },
-        host: {
-            cflags: [
-                "-DCR_SYSROOT_KEY=20230611T210420Z-2",
-                "-DUSE_AURA=1",
-                "-DUSE_OZONE=1",
-                "-DUSE_UDEV",
-                "-D_FILE_OFFSET_BITS=64",
-                "-D_FORTIFY_SOURCE=2",
-                "-D_LARGEFILE64_SOURCE",
-                "-D_LARGEFILE_SOURCE",
-                "-O2",
-                "-fstack-protector",
-                "-msse3",
-            ],
-            compile_multilib: "64",
-        },
-    },
-}
-
 // GN: //base/allocator/partition_allocator/src/partition_alloc:partition_alloc_buildflags
 cc_genrule {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
@@ -1669,6 +1384,10 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_buildflags.h",
     ],
+    export_include_dirs: [
+        ".",
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1756,6 +1475,10 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_buildflags.h",
     ],
+    export_include_dirs: [
+        ".",
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -1767,6 +1490,9 @@
 // GN: //base/allocator/partition_allocator/src/partition_alloc:raw_ptr
 cc_library_static {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr",
+    srcs: [
+        "base/allocator/partition_allocator/src/partition_alloc/pointers/empty.cc",
+    ],
     generated_headers: [
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromeos_buildflags",
@@ -1787,8 +1513,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_RAW_PTR_IMPL",
@@ -1796,9 +1522,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -1862,6 +1589,9 @@
 // GN: //base/allocator/partition_allocator/src/partition_alloc:raw_ptr__testing
 cc_library_static {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
+    srcs: [
+        "base/allocator/partition_allocator/src/partition_alloc/pointers/empty.cc",
+    ],
     host_supported: true,
     generated_headers: [
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_chromecast_buildflags__testing",
@@ -1881,8 +1611,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DIS_RAW_PTR_IMPL",
         "-DNDEBUG",
@@ -1891,7 +1621,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -1923,6 +1653,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -1932,6 +1663,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -1942,6 +1674,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -1950,6 +1683,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -1959,6 +1693,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -1997,6 +1732,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/raw_ptr_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -2021,6 +1759,9 @@
     out: [
         "base/allocator/partition_allocator/src/partition_alloc/raw_ptr_buildflags.h",
     ],
+    export_include_dirs: [
+        "base/allocator/partition_allocator/src/",
+    ],
     tool_files: [
         "build/write_buildflag_header.py",
     ],
@@ -2190,9 +1931,9 @@
     ],
 }
 
-// GN: //base:android_runtime_jni_headers
+// GN: //base:android_runtime_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_base_android_runtime_jni_headers",
+    name: "cronet_aml_base_android_runtime_jni_headers__action",
     tools: [
         ":javap",
     ],
@@ -2235,9 +1976,9 @@
     ],
 }
 
-// GN: //base:android_runtime_jni_headers__testing
+// GN: //base:android_runtime_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_base_android_runtime_jni_headers__testing",
+    name: "cronet_aml_base_android_runtime_jni_headers__action__testing",
     tools: [
         ":javap",
     ],
@@ -2280,9 +2021,9 @@
     ],
 }
 
-// GN: //base:android_runtime_unchecked_jni_headers
+// GN: //base:android_runtime_unchecked_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_base_android_runtime_unchecked_jni_headers",
+    name: "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
     tools: [
         ":javap",
     ],
@@ -2321,9 +2062,9 @@
     ],
 }
 
-// GN: //base:android_runtime_unchecked_jni_headers__testing
+// GN: //base:android_runtime_unchecked_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
+    name: "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
     tools: [
         ":javap",
     ],
@@ -2441,7 +2182,6 @@
         "base/check_is_test.cc",
         "base/check_op.cc",
         "base/command_line.cc",
-        "base/containers/flat_tree.cc",
         "base/containers/intrusive_heap.cc",
         "base/containers/linked_list.cc",
         "base/cpu.cc",
@@ -2642,6 +2382,7 @@
         "base/strings/abseil_string_number_conversions.cc",
         "base/strings/escape.cc",
         "base/strings/latin1_string_conversions.cc",
+        "base/strings/levenshtein_distance.cc",
         "base/strings/pattern.cc",
         "base/strings/safe_sprintf.cc",
         "base/strings/strcat.cc",
@@ -2720,6 +2461,7 @@
         "base/task/thread_pool/environment_config.cc",
         "base/task/thread_pool/initialization_util.cc",
         "base/task/thread_pool/job_task_source.cc",
+        "base/task/thread_pool/job_task_source_old.cc",
         "base/task/thread_pool/pooled_parallel_task_runner.cc",
         "base/task/thread_pool/pooled_sequenced_task_runner.cc",
         "base/task/thread_pool/pooled_single_thread_task_runner_manager.cc",
@@ -2738,6 +2480,7 @@
         "base/task/thread_pool/thread_pool_instance.cc",
         "base/task/thread_pool/worker_thread.cc",
         "base/task/thread_pool/worker_thread_set.cc",
+        "base/task/thread_pool/worker_thread_waitable_event.cc",
         "base/third_party/cityhash/city.cc",
         "base/third_party/cityhash_v103/src/city_v103.cc",
         "base/third_party/nspr/prtime.cc",
@@ -2796,6 +2539,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -2808,21 +2552,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -2842,21 +2587,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -2878,8 +2624,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBASE_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -2888,6 +2634,8 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -2896,7 +2644,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -3021,7 +2769,6 @@
         "base/check_is_test.cc",
         "base/check_op.cc",
         "base/command_line.cc",
-        "base/containers/flat_tree.cc",
         "base/containers/intrusive_heap.cc",
         "base/containers/linked_list.cc",
         "base/cpu.cc",
@@ -3212,6 +2959,7 @@
         "base/strings/abseil_string_number_conversions.cc",
         "base/strings/escape.cc",
         "base/strings/latin1_string_conversions.cc",
+        "base/strings/levenshtein_distance.cc",
         "base/strings/pattern.cc",
         "base/strings/safe_sprintf.cc",
         "base/strings/strcat.cc",
@@ -3289,6 +3037,7 @@
         "base/task/thread_pool/environment_config.cc",
         "base/task/thread_pool/initialization_util.cc",
         "base/task/thread_pool/job_task_source.cc",
+        "base/task/thread_pool/job_task_source_old.cc",
         "base/task/thread_pool/pooled_parallel_task_runner.cc",
         "base/task/thread_pool/pooled_sequenced_task_runner.cc",
         "base/task/thread_pool/pooled_single_thread_task_runner_manager.cc",
@@ -3307,6 +3056,7 @@
         "base/task/thread_pool/thread_pool_instance.cc",
         "base/task/thread_pool/worker_thread.cc",
         "base/task/thread_pool/worker_thread_set.cc",
+        "base/task/thread_pool/worker_thread_waitable_event.cc",
         "base/third_party/cityhash/city.cc",
         "base/third_party/cityhash_v103/src/city_v103.cc",
         "base/third_party/nspr/prtime.cc",
@@ -3375,6 +3125,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -3404,6 +3155,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -3425,8 +3177,8 @@
     ],
     cflags: [
         "-DBASE_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
         "-DIS_RAW_PTR_IMPL",
@@ -3442,7 +3194,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -3558,10 +3310,15 @@
                 "base/time/time_android.cc",
                 "base/trace_event/cfi_backtrace_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -3569,13 +3326,13 @@
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -3672,10 +3429,15 @@
                 "base/threading/platform_thread_android.cc",
                 "base/time/time_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -3684,13 +3446,13 @@
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -3786,23 +3548,28 @@
                 "base/threading/platform_thread_android.cc",
                 "base/time/time_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-fstack-protector",
             ],
             local_include_dirs: [
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -3898,10 +3665,15 @@
                 "base/threading/platform_thread_android.cc",
                 "base/time/time_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -3909,13 +3681,13 @@
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -4011,10 +3783,15 @@
                 "base/threading/platform_thread_android.cc",
                 "base/time/time_android.cc",
             ],
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
+                "-DUSE_CHROMIUM_BASE",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -4023,13 +3800,13 @@
                 "third_party/cpu_features/src/ndk_compat/",
             ],
             generated_headers: [
-                "cronet_aml_base_android_runtime_jni_headers__testing",
-                "cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
-                "cronet_aml_base_base_jni__testing",
-                "cronet_aml_base_base_shared_preferences_jni__testing",
+                "cronet_aml_base_android_runtime_jni_headers__action__testing",
+                "cronet_aml_base_android_runtime_unchecked_jni_headers__action__testing",
+                "cronet_aml_base_base_jni__action__testing",
+                "cronet_aml_base_base_shared_preferences_jni__action__testing",
                 "cronet_aml_base_debugging_buildflags__testing",
                 "cronet_aml_base_logging_buildflags__testing",
-                "cronet_aml_base_process_launcher_jni__testing",
+                "cronet_aml_base_process_launcher_jni__action__testing",
                 "cronet_aml_build_chromeos_buildflags__testing",
             ],
             ldflags: [
@@ -4161,7 +3938,7 @@
     name: "cronet_aml_base_base_java",
     srcs: [
         ":cronet_aml_base_base_android_java_enums_srcjar",
-        ":cronet_aml_base_base_jni__java",
+        ":cronet_aml_base_base_jni__action__java",
         ":cronet_aml_base_java_features_srcjar",
         ":cronet_aml_base_java_switches_srcjar",
         "base/android/java/src/org/chromium/base/ActivityState.java",
@@ -4194,11 +3971,13 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LifetimeAssert.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/Log.java",
         "base/android/java/src/org/chromium/base/MathUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
+        "base/android/java/src/org/chromium/base/MutableFlagWithSafeDefault.java",
         "base/android/java/src/org/chromium/base/ObserverList.java",
         "base/android/java/src/org/chromium/base/PackageManagerUtils.java",
         "base/android/java/src/org/chromium/base/PackageUtils.java",
@@ -4281,6 +4060,7 @@
         "base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java",
         "base/android/java/src/org/chromium/base/supplier/Supplier.java",
+        "base/android/java/src/org/chromium/base/supplier/SupplierUtils.java",
         "base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java",
         "base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java",
@@ -4303,7 +4083,6 @@
         "base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java",
     ],
     static_libs: [
-        "cronet_aml_base_jni_java",
         "cronet_aml_build_android_build_java",
         "cronet_aml_third_party_jni_zero_jni_zero_java",
     ],
@@ -4326,7 +4105,7 @@
     name: "cronet_aml_base_base_java__testing",
     srcs: [
         ":cronet_aml_base_base_android_java_enums_srcjar__testing",
-        ":cronet_aml_base_base_jni__testing__java",
+        ":cronet_aml_base_base_jni__action__testing__java",
         ":cronet_aml_base_java_features_srcjar__testing",
         ":cronet_aml_base_java_switches_srcjar__testing",
         "base/android/java/src/org/chromium/base/ActivityState.java",
@@ -4359,11 +4138,13 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LifetimeAssert.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/Log.java",
         "base/android/java/src/org/chromium/base/MathUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
+        "base/android/java/src/org/chromium/base/MutableFlagWithSafeDefault.java",
         "base/android/java/src/org/chromium/base/ObserverList.java",
         "base/android/java/src/org/chromium/base/PackageManagerUtils.java",
         "base/android/java/src/org/chromium/base/PackageUtils.java",
@@ -4446,6 +4227,7 @@
         "base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java",
         "base/android/java/src/org/chromium/base/supplier/Supplier.java",
+        "base/android/java/src/org/chromium/base/supplier/SupplierUtils.java",
         "base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java",
         "base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java",
@@ -4468,7 +4250,6 @@
         "base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java",
     ],
     static_libs: [
-        "cronet_aml_base_jni_java__testing",
         "cronet_aml_build_android_build_java__testing",
         "cronet_aml_third_party_jni_zero_jni_zero_java__testing",
     ],
@@ -4616,9 +4397,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //base:base_jni
+// GN: //base:base_jni__action
 cc_genrule {
-    name: "cronet_aml_base_base_jni",
+    name: "cronet_aml_base_base_jni__action",
     srcs: [
         "base/android/java/src/org/chromium/base/ApkAssets.java",
         "base/android/java/src/org/chromium/base/ApplicationStatus.java",
@@ -4641,11 +4422,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -4715,6 +4496,8 @@
          "--output-name " +
          "JavaHandlerThread_jni.h " +
          "--output-name " +
+         "JniAndroid_jni.h " +
+         "--output-name " +
          "LocaleUtils_jni.h " +
          "--output-name " +
          "MemoryPressureListener_jni.h " +
@@ -4723,8 +4506,6 @@
          "--output-name " +
          "PathUtils_jni.h " +
          "--output-name " +
-         "PiiElider_jni.h " +
-         "--output-name " +
          "PowerMonitor_jni.h " +
          "--output-name " +
          "RadioUtils_jni.h " +
@@ -4799,6 +4580,8 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/JavaHandlerThread.java) " +
          "--input-file " +
+         "$(location base/android/java/src/org/chromium/base/JniAndroid.java) " +
+         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/LocaleUtils.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/MemoryPressureListener.java) " +
@@ -4807,8 +4590,6 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PathUtils.java) " +
          "--input-file " +
-         "$(location base/android/java/src/org/chromium/base/PiiElider.java) " +
-         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PowerMonitor.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/RadioUtils.java) " +
@@ -4867,6 +4648,7 @@
         "base/base_jni/JavaExceptionReporter_jni.h",
         "base/base_jni/JavaHandlerThread_jni.h",
         "base/base_jni/JavaHeapDumpGenerator_jni.h",
+        "base/base_jni/JniAndroid_jni.h",
         "base/base_jni/LibraryLoader_jni.h",
         "base/base_jni/LibraryPrefetcher_jni.h",
         "base/base_jni/LocaleUtils_jni.h",
@@ -4875,7 +4657,6 @@
         "base/base_jni/NativeUmaRecorder_jni.h",
         "base/base_jni/PathService_jni.h",
         "base/base_jni/PathUtils_jni.h",
-        "base/base_jni/PiiElider_jni.h",
         "base/base_jni/PostTask_jni.h",
         "base/base_jni/PowerMonitor_jni.h",
         "base/base_jni/RadioUtils_jni.h",
@@ -4904,9 +4685,9 @@
     ],
 }
 
-// GN: //base:base_jni
+// GN: //base:base_jni__action
 java_genrule {
-    name: "cronet_aml_base_base_jni__java",
+    name: "cronet_aml_base_base_jni__action__java",
     srcs: [
         "base/android/java/src/org/chromium/base/ApkAssets.java",
         "base/android/java/src/org/chromium/base/ApplicationStatus.java",
@@ -4929,11 +4710,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -5003,6 +4784,8 @@
          "--output-name " +
          "JavaHandlerThread_jni.h " +
          "--output-name " +
+         "JniAndroid_jni.h " +
+         "--output-name " +
          "LocaleUtils_jni.h " +
          "--output-name " +
          "MemoryPressureListener_jni.h " +
@@ -5011,8 +4794,6 @@
          "--output-name " +
          "PathUtils_jni.h " +
          "--output-name " +
-         "PiiElider_jni.h " +
-         "--output-name " +
          "PowerMonitor_jni.h " +
          "--output-name " +
          "RadioUtils_jni.h " +
@@ -5087,6 +4868,8 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/JavaHandlerThread.java) " +
          "--input-file " +
+         "$(location base/android/java/src/org/chromium/base/JniAndroid.java) " +
+         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/LocaleUtils.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/MemoryPressureListener.java) " +
@@ -5095,8 +4878,6 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PathUtils.java) " +
          "--input-file " +
-         "$(location base/android/java/src/org/chromium/base/PiiElider.java) " +
-         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PowerMonitor.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/RadioUtils.java) " +
@@ -5155,6 +4936,7 @@
         "base/base_jni/JavaExceptionReporter_jni.h",
         "base/base_jni/JavaHandlerThread_jni.h",
         "base/base_jni/JavaHeapDumpGenerator_jni.h",
+        "base/base_jni/JniAndroid_jni.h",
         "base/base_jni/LibraryLoader_jni.h",
         "base/base_jni/LibraryPrefetcher_jni.h",
         "base/base_jni/LocaleUtils_jni.h",
@@ -5163,7 +4945,6 @@
         "base/base_jni/NativeUmaRecorder_jni.h",
         "base/base_jni/PathService_jni.h",
         "base/base_jni/PathUtils_jni.h",
-        "base/base_jni/PiiElider_jni.h",
         "base/base_jni/PostTask_jni.h",
         "base/base_jni/PowerMonitor_jni.h",
         "base/base_jni/RadioUtils_jni.h",
@@ -5189,9 +4970,9 @@
     ],
 }
 
-// GN: //base:base_jni__testing
+// GN: //base:base_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_base_base_jni__testing",
+    name: "cronet_aml_base_base_jni__action__testing",
     srcs: [
         "base/android/java/src/org/chromium/base/ApkAssets.java",
         "base/android/java/src/org/chromium/base/ApplicationStatus.java",
@@ -5214,11 +4995,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -5288,6 +5069,8 @@
          "--output-name " +
          "JavaHandlerThread_jni.h " +
          "--output-name " +
+         "JniAndroid_jni.h " +
+         "--output-name " +
          "LocaleUtils_jni.h " +
          "--output-name " +
          "MemoryPressureListener_jni.h " +
@@ -5296,8 +5079,6 @@
          "--output-name " +
          "PathUtils_jni.h " +
          "--output-name " +
-         "PiiElider_jni.h " +
-         "--output-name " +
          "PowerMonitor_jni.h " +
          "--output-name " +
          "RadioUtils_jni.h " +
@@ -5372,6 +5153,8 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/JavaHandlerThread.java) " +
          "--input-file " +
+         "$(location base/android/java/src/org/chromium/base/JniAndroid.java) " +
+         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/LocaleUtils.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/MemoryPressureListener.java) " +
@@ -5380,8 +5163,6 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PathUtils.java) " +
          "--input-file " +
-         "$(location base/android/java/src/org/chromium/base/PiiElider.java) " +
-         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PowerMonitor.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/RadioUtils.java) " +
@@ -5438,6 +5219,7 @@
         "base/base_jni/JavaExceptionReporter_jni.h",
         "base/base_jni/JavaHandlerThread_jni.h",
         "base/base_jni/JavaHeapDumpGenerator_jni.h",
+        "base/base_jni/JniAndroid_jni.h",
         "base/base_jni/LibraryLoader_jni.h",
         "base/base_jni/LibraryPrefetcher_jni.h",
         "base/base_jni/LocaleUtils_jni.h",
@@ -5446,7 +5228,6 @@
         "base/base_jni/NativeUmaRecorder_jni.h",
         "base/base_jni/PathService_jni.h",
         "base/base_jni/PathUtils_jni.h",
-        "base/base_jni/PiiElider_jni.h",
         "base/base_jni/PostTask_jni.h",
         "base/base_jni/PowerMonitor_jni.h",
         "base/base_jni/RadioUtils_jni.h",
@@ -5475,9 +5256,9 @@
     ],
 }
 
-// GN: //base:base_jni__testing
+// GN: //base:base_jni__action__testing
 java_genrule {
-    name: "cronet_aml_base_base_jni__testing__java",
+    name: "cronet_aml_base_base_jni__action__testing__java",
     srcs: [
         "base/android/java/src/org/chromium/base/ApkAssets.java",
         "base/android/java/src/org/chromium/base/ApplicationStatus.java",
@@ -5500,11 +5281,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -5574,6 +5355,8 @@
          "--output-name " +
          "JavaHandlerThread_jni.h " +
          "--output-name " +
+         "JniAndroid_jni.h " +
+         "--output-name " +
          "LocaleUtils_jni.h " +
          "--output-name " +
          "MemoryPressureListener_jni.h " +
@@ -5582,8 +5365,6 @@
          "--output-name " +
          "PathUtils_jni.h " +
          "--output-name " +
-         "PiiElider_jni.h " +
-         "--output-name " +
          "PowerMonitor_jni.h " +
          "--output-name " +
          "RadioUtils_jni.h " +
@@ -5658,6 +5439,8 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/JavaHandlerThread.java) " +
          "--input-file " +
+         "$(location base/android/java/src/org/chromium/base/JniAndroid.java) " +
+         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/LocaleUtils.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/MemoryPressureListener.java) " +
@@ -5666,8 +5449,6 @@
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PathUtils.java) " +
          "--input-file " +
-         "$(location base/android/java/src/org/chromium/base/PiiElider.java) " +
-         "--input-file " +
          "$(location base/android/java/src/org/chromium/base/PowerMonitor.java) " +
          "--input-file " +
          "$(location base/android/java/src/org/chromium/base/RadioUtils.java) " +
@@ -5724,6 +5505,7 @@
         "base/base_jni/JavaExceptionReporter_jni.h",
         "base/base_jni/JavaHandlerThread_jni.h",
         "base/base_jni/JavaHeapDumpGenerator_jni.h",
+        "base/base_jni/JniAndroid_jni.h",
         "base/base_jni/LibraryLoader_jni.h",
         "base/base_jni/LibraryPrefetcher_jni.h",
         "base/base_jni/LocaleUtils_jni.h",
@@ -5732,7 +5514,6 @@
         "base/base_jni/NativeUmaRecorder_jni.h",
         "base/base_jni/PathService_jni.h",
         "base/base_jni/PathUtils_jni.h",
-        "base/base_jni/PiiElider_jni.h",
         "base/base_jni/PostTask_jni.h",
         "base/base_jni/PowerMonitor_jni.h",
         "base/base_jni/RadioUtils_jni.h",
@@ -5758,9 +5539,9 @@
     ],
 }
 
-// GN: //base:base_shared_preferences_jni
+// GN: //base:base_shared_preferences_jni__action
 cc_genrule {
-    name: "cronet_aml_base_base_shared_preferences_jni",
+    name: "cronet_aml_base_base_shared_preferences_jni__action",
     srcs: [
         "base/android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
     ],
@@ -5800,9 +5581,9 @@
     ],
 }
 
-// GN: //base:base_shared_preferences_jni__testing
+// GN: //base:base_shared_preferences_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_base_base_shared_preferences_jni__testing",
+    name: "cronet_aml_base_base_shared_preferences_jni__action__testing",
     srcs: [
         "base/android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
     ],
@@ -5847,9 +5628,11 @@
         "base/base_switches.cc",
     ],
     generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_build_chromeos_buildflags",
     ],
     export_generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_build_chromeos_buildflags",
     ],
     defaults: [
@@ -5858,17 +5641,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -5936,17 +5720,19 @@
     ],
     host_supported: true,
     generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
     ],
     export_generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -5954,7 +5740,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -5985,6 +5771,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
             ],
@@ -5994,6 +5781,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-mno-outline",
@@ -6004,6 +5792,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -6012,6 +5801,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-msse3",
             ],
@@ -6021,6 +5811,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-fstack-protector",
                 "-msse3",
@@ -6048,7 +5839,7 @@
 cc_genrule {
     name: "cronet_aml_base_build_date",
     cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
-         "1707253023",
+         "1712072430",
     out: [
         "base/generated_build_date.h",
     ],
@@ -6064,7 +5855,7 @@
 cc_genrule {
     name: "cronet_aml_base_build_date__testing",
     cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
-         "1707253023",
+         "1712072430",
     host_supported: true,
     out: [
         "base/generated_build_date.h",
@@ -6379,6 +6170,53 @@
     ],
 }
 
+// GN: //base:fuzzing_buildflags
+cc_genrule {
+    name: "cronet_aml_base_fuzzing_buildflags",
+    cmd: "mkdir -p $(genDir)/base && echo '--flags USE_FUZZING_ENGINE=\"false\"' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:fuzzing_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
+    out: [
+        "base/fuzzing_buildflags.h",
+    ],
+    tool_files: [
+        "build/write_buildflag_header.py",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+// GN: //base:fuzzing_buildflags__testing
+cc_genrule {
+    name: "cronet_aml_base_fuzzing_buildflags__testing",
+    cmd: "mkdir -p $(genDir)/base && echo '--flags USE_FUZZING_ENGINE=\"false\"' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:fuzzing_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
+    host_supported: true,
+    out: [
+        "base/fuzzing_buildflags.h",
+    ],
+    tool_files: [
+        "build/write_buildflag_header.py",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
 // GN: //base:i18n__testing
 cc_library_static {
     name: "cronet_aml_base_i18n__testing",
@@ -6420,6 +6258,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -6449,6 +6288,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -6472,8 +6312,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBASE_I18N_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -6481,6 +6321,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -6489,7 +6330,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -6734,32 +6575,10 @@
     ],
 }
 
-// GN: //base:jni_java
-java_library {
-    name: "cronet_aml_base_jni_java",
-    apex_available: [
-        "com.android.tethering",
-    ],
-    min_sdk_version: "30",
-    sdk_version: "current",
-    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
-}
-
-// GN: //base:jni_java__testing
-java_library {
-    name: "cronet_aml_base_jni_java__testing",
-    apex_available: [
-        "com.android.tethering",
-    ],
-    min_sdk_version: "30",
-    sdk_version: "current",
-    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
-}
-
 // GN: //base:logging_buildflags
 cc_genrule {
     name: "cronet_aml_base_logging_buildflags",
-    cmd: "mkdir -p $(genDir)/base && echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\" USE_RUNTIME_VLOG=\"true\"' | " +
+    cmd: "mkdir -p $(genDir)/base && echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6782,7 +6601,7 @@
 // GN: //base:logging_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_logging_buildflags__testing",
-    cmd: "mkdir -p $(genDir)/base && echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\" USE_RUNTIME_VLOG=\"true\"' | " +
+    cmd: "mkdir -p $(genDir)/base && echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6857,9 +6676,11 @@
         "base/nodebug_assertion.cc",
     ],
     generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_build_chromeos_buildflags",
     ],
     export_generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_build_chromeos_buildflags",
     ],
     defaults: [
@@ -6869,17 +6690,18 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBASE_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -6947,9 +6769,11 @@
     ],
     host_supported: true,
     generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
     ],
     export_generated_headers: [
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
     ],
     defaults: [
@@ -6957,8 +6781,8 @@
     ],
     cflags: [
         "-DBASE_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -6966,7 +6790,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -6996,6 +6820,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -7006,6 +6831,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -7017,6 +6843,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -7026,6 +6853,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -7036,6 +6864,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -7182,7 +7011,7 @@
 java_library {
     name: "cronet_aml_base_process_launcher_java__testing",
     srcs: [
-        ":cronet_aml_base_process_launcher_jni__testing__java",
+        ":cronet_aml_base_process_launcher_jni__action__testing__java",
         "base/android/java/src/org/chromium/base/process_launcher/BindService.java",
         "base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java",
         "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java",
@@ -7198,9 +7027,9 @@
     ],
     static_libs: [
         "cronet_aml_base_base_java__testing",
-        "cronet_aml_base_jni_java__testing",
         "cronet_aml_base_process_launcher_aidl__testing",
         "cronet_aml_build_android_build_java__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_java__testing",
     ],
     apex_available: [
         "com.android.tethering",
@@ -7217,9 +7046,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //base:process_launcher_jni
+// GN: //base:process_launcher_jni__action
 cc_genrule {
-    name: "cronet_aml_base_process_launcher_jni",
+    name: "cronet_aml_base_process_launcher_jni__action",
     srcs: [
         "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
     ],
@@ -7259,9 +7088,9 @@
     ],
 }
 
-// GN: //base:process_launcher_jni__testing
+// GN: //base:process_launcher_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_base_process_launcher_jni__testing",
+    name: "cronet_aml_base_process_launcher_jni__action__testing",
     srcs: [
         "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
     ],
@@ -7299,9 +7128,9 @@
     ],
 }
 
-// GN: //base:process_launcher_jni__testing
+// GN: //base:process_launcher_jni__action__testing
 java_genrule {
-    name: "cronet_aml_base_process_launcher_jni__testing__java",
+    name: "cronet_aml_base_process_launcher_jni__action__testing__java",
     srcs: [
         "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
     ],
@@ -7638,9 +7467,9 @@
     ],
 }
 
-// GN: //base/test:base_unittests_jni_headers__testing
+// GN: //base/test:base_unittests_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_base_test_base_unittests_jni_headers__testing",
+    name: "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
     srcs: [
         "base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java",
         "base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java",
@@ -7708,6 +7537,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -7737,6 +7567,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -7759,17 +7590,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -7940,6 +7772,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -7949,8 +7782,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -7971,6 +7804,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -7980,8 +7814,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -7996,8 +7830,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -8010,7 +7844,9 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -8019,7 +7855,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -8049,6 +7885,7 @@
         "third_party/libc++abi/src/include",
         "third_party/libxml/linux/include/",
         "third_party/libxml/src/include/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -8169,9 +8006,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //base/test:test_support_jni_headers__testing
+// GN: //base/test:test_support_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_base_test_test_support_jni_headers__testing",
+    name: "cronet_aml_base_test_test_support_jni_headers__action__testing",
     srcs: [
         "base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java",
         "base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
@@ -8252,17 +8089,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -8340,8 +8178,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -8349,7 +8187,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -8379,6 +8217,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -8389,6 +8228,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -8400,6 +8240,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -8409,6 +8250,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -8419,6 +8261,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -8456,17 +8299,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -8531,8 +8375,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -8540,7 +8384,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -8569,6 +8413,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -8577,6 +8422,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -8586,6 +8432,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -8594,6 +8441,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
         },
@@ -8602,6 +8450,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -9279,6 +9128,7 @@
         "third_party/libc++/src/src/atomic.cpp",
         "third_party/libc++/src/src/barrier.cpp",
         "third_party/libc++/src/src/bind.cpp",
+        "third_party/libc++/src/src/call_once.cpp",
         "third_party/libc++/src/src/charconv.cpp",
         "third_party/libc++/src/src/chrono.cpp",
         "third_party/libc++/src/src/condition_variable.cpp",
@@ -9327,8 +9177,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DLIBCXX_BUILDING_LIBCXXABI",
         "-DNDEBUG",
@@ -9338,7 +9188,7 @@
         "-D_GNU_SOURCE",
         "-D_LIBCPP_BUILDING_LIBRARY",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
@@ -9372,6 +9222,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9381,6 +9232,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -9391,6 +9243,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9400,6 +9253,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -9409,6 +9263,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -9445,6 +9300,7 @@
         "third_party/libc++/src/src/atomic.cpp",
         "third_party/libc++/src/src/barrier.cpp",
         "third_party/libc++/src/src/bind.cpp",
+        "third_party/libc++/src/src/call_once.cpp",
         "third_party/libc++/src/src/charconv.cpp",
         "third_party/libc++/src/src/chrono.cpp",
         "third_party/libc++/src/src/condition_variable.cpp",
@@ -9493,8 +9349,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DLIBCXX_BUILDING_LIBCXXABI",
         "-DNDEBUG",
@@ -9504,7 +9360,7 @@
         "-D_GNU_SOURCE",
         "-D_LIBCPP_BUILDING_LIBRARY",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
@@ -9538,6 +9394,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9547,6 +9404,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -9557,6 +9415,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9566,6 +9425,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -9575,6 +9435,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -9628,8 +9489,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DLIBCXXABI_SILENT_TERMINATE",
         "-DNDEBUG",
@@ -9639,7 +9500,7 @@
         "-D_GNU_SOURCE",
         "-D_LIBCPP_BUILDING_LIBRARY",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -9675,6 +9536,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9687,6 +9549,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -9701,6 +9564,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
                 "-DHAVE___CXA_THREAD_ATEXIT_IMPL",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9713,6 +9577,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -9725,6 +9590,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -9777,8 +9643,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DLIBCXXABI_SILENT_TERMINATE",
         "-DNDEBUG",
@@ -9788,7 +9654,7 @@
         "-D_GNU_SOURCE",
         "-D_LIBCPP_BUILDING_LIBRARY",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -9824,6 +9690,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9836,6 +9703,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -9850,6 +9718,7 @@
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
                 "-DHAVE___CXA_THREAD_ATEXIT_IMPL",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -9862,6 +9731,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -9874,6 +9744,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -10014,8 +9885,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10026,9 +9897,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -10111,8 +9983,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10123,9 +9995,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -10276,6 +10149,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -10285,7 +10159,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr",
         "cronet_aml_base_base",
         "cronet_aml_base_base_static",
@@ -10400,6 +10273,7 @@
         "cronet_aml_third_party_cpu_features_ndk_compat",
         "cronet_aml_third_party_icu_icui18n",
         "cronet_aml_third_party_icu_icuuc_private",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils",
         "cronet_aml_third_party_libevent_libevent",
         "cronet_aml_third_party_metrics_proto_metrics_proto",
         "cronet_aml_third_party_modp_b64_modp_b64",
@@ -10412,8 +10286,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10424,9 +10298,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -10474,7 +10349,7 @@
         "-Wl,-wrap,valloc",
         "-Wl,-wrap,vasprintf",
     ],
-    stem: "libmainlinecronet.121.0.6103.2",
+    stem: "libmainlinecronet.121.0.6167.71",
     visibility: [
         "//external/cronet:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
@@ -10537,7 +10412,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -10654,6 +10528,7 @@
         "cronet_aml_third_party_cpu_features_ndk_compat__testing",
         "cronet_aml_third_party_icu_icui18n__testing",
         "cronet_aml_third_party_icu_icuuc_private__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
         "cronet_aml_third_party_libevent_libevent__testing",
         "cronet_aml_third_party_metrics_proto_metrics_proto__testing",
         "cronet_aml_third_party_modp_b64_modp_b64__testing",
@@ -10666,8 +10541,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10678,9 +10553,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -10728,7 +10604,7 @@
         "-Wl,-wrap,valloc",
         "-Wl,-wrap,vasprintf",
     ],
-    stem: "libmainlinecronet.121.0.6103.2",
+    stem: "libmainlinecronet.121.0.6167.71",
     visibility: [
         "//external/cronet:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
@@ -10888,6 +10764,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -10901,21 +10778,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -10936,21 +10814,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -10969,8 +10848,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -10981,9 +10860,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -11087,6 +10967,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -11117,6 +10998,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -11140,8 +11022,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -11152,9 +11034,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -11259,6 +11142,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -11268,8 +11152,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -11291,6 +11175,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -11300,8 +11185,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -11317,8 +11202,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -11335,6 +11220,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
@@ -11344,7 +11230,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -11373,6 +11259,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -11468,7 +11355,7 @@
         "androidx.annotation_annotation-nodeps",
         "androidx.core_core-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11476,59 +11363,16 @@
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_impl_all_java__testing",
     static_libs: [
-        "cronet_aml_components_cronet_android_cronet_impl_aosp_native_base_java__testing",
         "cronet_aml_components_cronet_android_cronet_impl_common_base_java__testing",
         "cronet_aml_components_cronet_android_cronet_impl_native_base_java__testing",
         "cronet_aml_components_cronet_android_cronet_impl_platform_base_java__testing",
+        "cronet_aml_components_cronet_android_httpengine_native_provider_base_java__testing",
     ],
     apex_available: [
         "com.android.tethering",
     ],
     min_sdk_version: "30",
-    sdk_version: "current",
-    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
-}
-
-// GN: //components/cronet/android:cronet_impl_aosp_native_base_java__testing
-java_library {
-    name: "cronet_aml_components_cronet_android_cronet_impl_aosp_native_base_java__testing",
-    srcs: [
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamBuilderWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidCallbackExceptionWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHeaderBlockWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineBuilderWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpExceptionWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidNetworkExceptionWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidQuicExceptionWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUploadDataSinkWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestBuilderWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlResponseInfoWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamCallbackWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionTranslationUtils.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/PlatformCronetProvider.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/UploadDataProviderWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestCallbackWrapper.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestStatusListenerWrapper.java",
-    ],
-    static_libs: [
-        "cronet_aml_base_base_java__testing",
-        "cronet_aml_build_android_build_java__testing",
-        "cronet_aml_components_cronet_android_cronet_api_java__testing",
-        "cronet_aml_components_cronet_android_cronet_impl_common_base_java__testing",
-        "cronet_aml_third_party_jni_zero_jni_zero_java__testing",
-    ],
-    apex_available: [
-        "com.android.tethering",
-    ],
-    min_sdk_version: "30",
-    libs: [
-        "androidx.annotation_annotation-nodeps",
-        "androidx.core_core-nodeps",
-    ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11559,9 +11403,14 @@
         "components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java",
         "components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/CronetLoggerImpl.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/ExperimentalOptions.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/RateLimiter.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/SizeBuckets.java",
     ],
     static_libs: [
         "cronet_aml_components_cronet_android_cronet_api_java",
+        "cronet_aml_components_cronet_android_cronet_stats_log_java",
         "cronet_aml_net_android_net_thread_stats_uid_java",
     ],
     apex_available: [
@@ -11571,7 +11420,7 @@
     libs: [
         "androidx.annotation_annotation-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11602,9 +11451,14 @@
         "components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java",
         "components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/CronetLoggerImpl.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/ExperimentalOptions.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/RateLimiter.java",
+        "components/cronet/android/java/src/org/chromium/net/telemetry/SizeBuckets.java",
     ],
     static_libs: [
         "cronet_aml_components_cronet_android_cronet_api_java__testing",
+        "cronet_aml_components_cronet_android_cronet_stats_log_java__testing",
         "cronet_aml_net_android_net_thread_stats_uid_java__testing",
     ],
     apex_available: [
@@ -11614,7 +11468,7 @@
     libs: [
         "androidx.annotation_annotation-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11636,7 +11490,7 @@
     libs: [
         "androidx.annotation_annotation-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11644,7 +11498,7 @@
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_impl_native_base_java",
     srcs: [
-        ":cronet_aml_components_cronet_android_cronet_jni_headers__java",
+        ":cronet_aml_components_cronet_android_cronet_jni_headers__action__java",
         ":cronet_aml_components_cronet_android_net_idempotency_java",
         ":cronet_aml_components_cronet_android_net_request_priority_java",
         ":cronet_aml_components_cronet_android_network_quality_observation_source_java",
@@ -11686,7 +11540,7 @@
         "androidx.annotation_annotation-nodeps",
         "jsr305",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     visibility: [
         "//external/cronet:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
@@ -11698,7 +11552,7 @@
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_impl_native_base_java__testing",
     srcs: [
-        ":cronet_aml_components_cronet_android_cronet_jni_headers__testing__java",
+        ":cronet_aml_components_cronet_android_cronet_jni_headers__action__testing__java",
         ":cronet_aml_components_cronet_android_net_idempotency_java__testing",
         ":cronet_aml_components_cronet_android_net_request_priority_java__testing",
         ":cronet_aml_components_cronet_android_network_quality_observation_source_java__testing",
@@ -11740,7 +11594,7 @@
         "androidx.annotation_annotation-nodeps",
         "jsr305",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11768,7 +11622,7 @@
         "androidx.annotation_annotation-nodeps",
         "jsr305",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
@@ -11776,7 +11630,7 @@
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_javatests__testing",
     srcs: [
-        ":cronet_aml_components_cronet_android_cronet_tests_jni_headers__testing__java",
+        ":cronet_aml_components_cronet_android_cronet_tests_jni_headers__action__testing__java",
         "components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java",
@@ -11812,6 +11666,10 @@
         "components/cronet/android/test/javatests/src/org/chromium/net/httpflags/ResolvedFlagsTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetManifestTest.java",
+        "components/cronet/android/test/javatests/src/org/chromium/net/telemetry/CronetLoggerImplTest.java",
+        "components/cronet/android/test/javatests/src/org/chromium/net/telemetry/ExperimentalOptionsTest.java",
+        "components/cronet/android/test/javatests/src/org/chromium/net/telemetry/RateLimiterTest.java",
+        "components/cronet/android/test/javatests/src/org/chromium/net/telemetry/SizeBucketsTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java",
@@ -11864,9 +11722,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //components/cronet/android:cronet_jni_headers
+// GN: //components/cronet/android:cronet_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_jni_headers",
+    name: "cronet_aml_components_cronet_android_cronet_jni_headers__action",
     srcs: [
         "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
         "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
@@ -11930,9 +11788,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_jni_headers
+// GN: //components/cronet/android:cronet_jni_headers__action
 java_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_jni_headers__java",
+    name: "cronet_aml_components_cronet_android_cronet_jni_headers__action__java",
     srcs: [
         "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
         "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
@@ -11993,9 +11851,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_jni_headers__testing
+// GN: //components/cronet/android:cronet_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_jni_headers__testing",
+    name: "cronet_aml_components_cronet_android_cronet_jni_headers__action__testing",
     srcs: [
         "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
         "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
@@ -12057,9 +11915,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_jni_headers__testing
+// GN: //components/cronet/android:cronet_jni_headers__action__testing
 java_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_jni_headers__testing__java",
+    name: "cronet_aml_components_cronet_android_cronet_jni_headers__action__testing__java",
     srcs: [
         "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
         "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
@@ -12143,11 +12001,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -12248,11 +12106,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -12349,11 +12207,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -12452,11 +12310,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -12601,6 +12459,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -12615,21 +12474,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -12642,24 +12502,24 @@
         "cronet_aml_build_config_compiler_compiler_buildflags",
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_components_cronet_android_base_feature_overrides_proto_gen_headers",
-        "cronet_aml_components_cronet_android_cronet_jni_headers",
+        "cronet_aml_components_cronet_android_cronet_jni_headers__action",
         "cronet_aml_components_cronet_android_cronet_jni_registration",
         "cronet_aml_components_cronet_android_request_context_config_proto_gen_headers",
         "cronet_aml_components_cronet_cronet_buildflags",
         "cronet_aml_components_cronet_cronet_version_header_action",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
         "cronet_aml_crypto_buildflags",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -12669,21 +12529,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -12696,24 +12557,24 @@
         "cronet_aml_build_config_compiler_compiler_buildflags",
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_components_cronet_android_base_feature_overrides_proto_gen_headers",
-        "cronet_aml_components_cronet_android_cronet_jni_headers",
+        "cronet_aml_components_cronet_android_cronet_jni_headers__action",
         "cronet_aml_components_cronet_android_cronet_jni_registration",
         "cronet_aml_components_cronet_android_request_context_config_proto_gen_headers",
         "cronet_aml_components_cronet_cronet_buildflags",
         "cronet_aml_components_cronet_cronet_version_header_action",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
         "cronet_aml_crypto_buildflags",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -12721,8 +12582,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -12733,9 +12594,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -12849,6 +12712,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -12866,24 +12730,24 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_android_base_feature_overrides_proto_gen__testing_headers",
-        "cronet_aml_components_cronet_android_cronet_jni_headers__testing",
+        "cronet_aml_components_cronet_android_cronet_jni_headers__action__testing",
         "cronet_aml_components_cronet_android_cronet_jni_registration__testing",
         "cronet_aml_components_cronet_android_request_context_config_proto_gen__testing_headers",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -12898,6 +12762,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -12915,24 +12780,24 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_android_base_feature_overrides_proto_gen__testing_headers",
-        "cronet_aml_components_cronet_android_cronet_jni_headers__testing",
+        "cronet_aml_components_cronet_android_cronet_jni_headers__action__testing",
         "cronet_aml_components_cronet_android_cronet_jni_registration__testing",
         "cronet_aml_components_cronet_android_request_context_config_proto_gen__testing_headers",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -12940,8 +12805,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -12952,9 +12817,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -13037,11 +12904,45 @@
     },
 }
 
+// GN: //components/cronet/android:cronet_stats_log_java
+java_library {
+    name: "cronet_aml_components_cronet_android_cronet_stats_log_java",
+    srcs: [
+        "components/cronet/android/java/src/org/chromium/net/telemetry/CronetStatsLog.java",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+    min_sdk_version: "30",
+    libs: [
+        "androidx.annotation_annotation-nodeps",
+    ],
+    sdk_version: "system_current",
+    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
+}
+
+// GN: //components/cronet/android:cronet_stats_log_java__testing
+java_library {
+    name: "cronet_aml_components_cronet_android_cronet_stats_log_java__testing",
+    srcs: [
+        "components/cronet/android/java/src/org/chromium/net/telemetry/CronetStatsLog.java",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+    min_sdk_version: "30",
+    libs: [
+        "androidx.annotation_annotation-nodeps",
+    ],
+    sdk_version: "system_current",
+    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
+}
+
 // GN: //components/cronet/android:cronet_test_apk_java__testing
 java_library {
     name: "cronet_aml_components_cronet_android_cronet_test_apk_java__testing",
     srcs: [
-        ":cronet_aml_components_cronet_android_cronet_test_apk_jni__testing__java",
+        ":cronet_aml_components_cronet_android_cronet_test_apk_jni__action__testing__java",
         "components/cronet/android/test/src/org/chromium/net/CronetTestApplication.java",
         "components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java",
         "components/cronet/android/test/src/org/chromium/net/Http2TestHandler.java",
@@ -13075,13 +12976,13 @@
         "android.test.base",
         "androidx.annotation_annotation-nodeps",
     ],
-    sdk_version: "current",
+    sdk_version: "system_current",
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //components/cronet/android:cronet_test_apk_jni__testing
+// GN: //components/cronet/android:cronet_test_apk_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_test_apk_jni__testing",
+    name: "cronet_aml_components_cronet_android_cronet_test_apk_jni__action__testing",
     srcs: [
         "components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java",
         "components/cronet/android/test/src/org/chromium/net/MockCertVerifier.java",
@@ -13149,9 +13050,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_test_apk_jni__testing
+// GN: //components/cronet/android:cronet_test_apk_jni__action__testing
 java_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_test_apk_jni__testing__java",
+    name: "cronet_aml_components_cronet_android_cronet_test_apk_jni__action__testing__java",
     srcs: [
         "components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java",
         "components/cronet/android/test/src/org/chromium/net/MockCertVerifier.java",
@@ -13241,7 +13142,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -13371,6 +13271,7 @@
         "cronet_aml_third_party_googletest_gtest__testing",
         "cronet_aml_third_party_icu_icui18n__testing",
         "cronet_aml_third_party_icu_icuuc_private__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
         "cronet_aml_third_party_libevent_libevent__testing",
         "cronet_aml_third_party_libxml_libxml__testing",
         "cronet_aml_third_party_libxml_libxml_utils__testing",
@@ -13379,14 +13280,15 @@
         "cronet_aml_third_party_modp_b64_modp_b64__testing",
         "cronet_aml_third_party_protobuf_protobuf_lite__testing",
         "cronet_aml_third_party_quic_trace_quic_trace_proto__testing",
+        "cronet_aml_third_party_re2_re2__testing",
         "cronet_aml_url_url__testing",
     ],
     generated_headers: [
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
-        "cronet_aml_components_cronet_android_cronet_test_apk_jni__testing",
-        "cronet_aml_components_cronet_android_cronet_tests_jni_headers__testing",
+        "cronet_aml_components_cronet_android_cronet_test_apk_jni__action__testing",
+        "cronet_aml_components_cronet_android_cronet_tests_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -13395,8 +13297,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -13413,7 +13315,9 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
         "-DU_ENABLE_DYLOAD=0",
@@ -13423,7 +13327,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -13455,6 +13359,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -13518,9 +13423,9 @@
     },
 }
 
-// GN: //components/cronet/android:cronet_tests_jni_headers__testing
+// GN: //components/cronet/android:cronet_tests_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_tests_jni_headers__testing",
+    name: "cronet_aml_components_cronet_android_cronet_tests_jni_headers__action__testing",
     srcs: [
         "components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java",
@@ -13570,9 +13475,9 @@
     ],
 }
 
-// GN: //components/cronet/android:cronet_tests_jni_headers__testing
+// GN: //components/cronet/android:cronet_tests_jni_headers__action__testing
 java_genrule {
-    name: "cronet_aml_components_cronet_android_cronet_tests_jni_headers__testing__java",
+    name: "cronet_aml_components_cronet_android_cronet_tests_jni_headers__action__testing__java",
     srcs: [
         "components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
         "components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java",
@@ -13644,11 +13549,11 @@
         "base/android/java/src/org/chromium/base/JNIUtils.java",
         "base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
         "base/android/java/src/org/chromium/base/JavaHandlerThread.java",
+        "base/android/java/src/org/chromium/base/JniAndroid.java",
         "base/android/java/src/org/chromium/base/LocaleUtils.java",
         "base/android/java/src/org/chromium/base/MemoryPressureListener.java",
         "base/android/java/src/org/chromium/base/PathService.java",
         "base/android/java/src/org/chromium/base/PathUtils.java",
-        "base/android/java/src/org/chromium/base/PiiElider.java",
         "base/android/java/src/org/chromium/base/PowerMonitor.java",
         "base/android/java/src/org/chromium/base/RadioUtils.java",
         "base/android/java/src/org/chromium/base/SysUtils.java",
@@ -13779,7 +13684,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -13918,6 +13822,7 @@
         "cronet_aml_third_party_googletest_gtest__testing",
         "cronet_aml_third_party_icu_icui18n__testing",
         "cronet_aml_third_party_icu_icuuc_private__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
         "cronet_aml_third_party_libevent_libevent__testing",
         "cronet_aml_third_party_libxml_libxml__testing",
         "cronet_aml_third_party_libxml_libxml_utils__testing",
@@ -13926,6 +13831,7 @@
         "cronet_aml_third_party_modp_b64_modp_b64__testing",
         "cronet_aml_third_party_protobuf_protobuf_lite__testing",
         "cronet_aml_third_party_quic_trace_quic_trace_proto__testing",
+        "cronet_aml_third_party_re2_re2__testing",
         "cronet_aml_url_url__testing",
     ],
     defaults: [
@@ -13935,8 +13841,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -13953,6 +13859,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -13963,7 +13870,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -13995,6 +13902,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -14248,6 +14156,48 @@
     ],
 }
 
+// GN: //components/cronet/android:httpengine_native_provider_base_java__testing
+java_library {
+    name: "cronet_aml_components_cronet_android_httpengine_native_provider_base_java__testing",
+    srcs: [
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamBuilderWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamCallbackWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidCallbackExceptionWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHeaderBlockWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineBuilderWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpExceptionWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidNetworkExceptionWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidQuicExceptionWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUploadDataProviderWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUploadDataSinkWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestBuilderWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestCallbackWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestStatusListenerWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlResponseInfoWrapper.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionTranslationUtils.java",
+        "components/cronet/android/java/src/org/chromium/net/impl/HttpEngineNativeProvider.java",
+    ],
+    static_libs: [
+        "cronet_aml_base_base_java__testing",
+        "cronet_aml_build_android_build_java__testing",
+        "cronet_aml_components_cronet_android_cronet_api_java__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_java__testing",
+    ],
+    apex_available: [
+        "com.android.tethering",
+    ],
+    min_sdk_version: "30",
+    libs: [
+        "androidx.annotation_annotation-nodeps",
+        "androidx.core_core-nodeps",
+    ],
+    sdk_version: "current",
+    jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
+}
+
 // GN: //components/cronet/android:implementation_api_version
 java_genrule {
     name: "cronet_aml_components_cronet_android_implementation_api_version",
@@ -14678,8 +14628,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -14690,9 +14640,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -14775,8 +14726,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -14787,9 +14738,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15076,6 +15028,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -15090,21 +15043,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -15118,19 +15072,19 @@
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_components_cronet_cronet_buildflags",
         "cronet_aml_components_cronet_cronet_version_header_action",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
         "cronet_aml_crypto_buildflags",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -15140,21 +15094,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -15168,19 +15123,19 @@
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_components_cronet_cronet_buildflags",
         "cronet_aml_components_cronet_cronet_version_header_action",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
         "cronet_aml_crypto_buildflags",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -15188,8 +15143,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -15200,9 +15155,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15316,6 +15272,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -15334,19 +15291,19 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -15361,6 +15318,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -15379,19 +15337,19 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -15399,8 +15357,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -15411,9 +15369,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15524,6 +15483,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -15533,8 +15493,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -15544,21 +15504,21 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -15573,6 +15533,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -15582,8 +15543,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -15593,21 +15554,21 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_components_cronet_cronet_buildflags__testing",
         "cronet_aml_components_cronet_cronet_version_header_action__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
         "cronet_aml_crypto_buildflags__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_metrics_proto_metrics_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -15616,8 +15577,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -15634,6 +15595,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -15644,7 +15606,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15676,6 +15638,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -15749,17 +15712,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15834,17 +15798,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -15964,6 +15929,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -15976,21 +15942,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16010,21 +15977,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16042,17 +16010,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16154,6 +16123,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16183,6 +16153,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16205,17 +16176,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16319,6 +16291,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16328,8 +16301,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -16343,13 +16316,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -16364,6 +16337,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16373,8 +16347,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -16388,13 +16362,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -16403,8 +16377,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -16421,6 +16395,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -16431,7 +16406,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16463,6 +16438,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -16530,6 +16506,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -16543,21 +16520,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16578,21 +16556,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16611,8 +16590,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -16623,9 +16602,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16730,6 +16710,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16760,6 +16741,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -16783,8 +16765,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -16795,9 +16777,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -16885,6 +16868,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -16897,21 +16881,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16931,21 +16916,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -16963,8 +16949,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_MIRACLE_PARAMETER_IMPL",
@@ -16972,9 +16958,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17076,6 +17063,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17105,6 +17093,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17127,8 +17116,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_MIRACLE_PARAMETER_IMPL",
@@ -17136,9 +17125,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17217,9 +17207,9 @@
     },
 }
 
-// GN: //components/prefs/android:jni_headers
+// GN: //components/prefs/android:jni_headers__action
 cc_genrule {
-    name: "cronet_aml_components_prefs_android_jni_headers",
+    name: "cronet_aml_components_prefs_android_jni_headers__action",
     srcs: [
         "components/prefs/android/java/src/org/chromium/components/prefs/PrefService.java",
     ],
@@ -17259,9 +17249,9 @@
     ],
 }
 
-// GN: //components/prefs/android:jni_headers__testing
+// GN: //components/prefs/android:jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_components_prefs_android_jni_headers__testing",
+    name: "cronet_aml_components_prefs_android_jni_headers__action__testing",
     srcs: [
         "components/prefs/android/java/src/org/chromium/components/prefs/PrefService.java",
     ],
@@ -17327,6 +17317,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -17339,21 +17330,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -17364,7 +17356,7 @@
         "cronet_aml_build_chromecast_buildflags",
         "cronet_aml_build_chromeos_buildflags",
         "cronet_aml_build_config_compiler_compiler_buildflags",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -17374,21 +17366,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -17399,7 +17392,7 @@
         "cronet_aml_build_chromecast_buildflags",
         "cronet_aml_build_chromeos_buildflags",
         "cronet_aml_build_config_compiler_compiler_buildflags",
-        "cronet_aml_components_prefs_android_jni_headers",
+        "cronet_aml_components_prefs_android_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -17408,17 +17401,19 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DCOMPONENTS_PREFS_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17540,6 +17535,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17555,7 +17551,7 @@
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -17570,6 +17566,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17585,7 +17582,7 @@
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -17594,17 +17591,19 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DCOMPONENTS_PREFS_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17711,6 +17710,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17720,15 +17720,15 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -17743,6 +17743,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -17752,15 +17753,15 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_components_prefs_android_jni_headers__testing",
+        "cronet_aml_components_prefs_android_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -17769,8 +17770,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -17783,6 +17784,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
@@ -17792,7 +17794,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -17820,6 +17822,7 @@
         "third_party/icu/source/i18n/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -17952,6 +17955,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -17964,21 +17968,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -17999,21 +18004,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -18033,17 +18039,18 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DCRYPTO_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -18161,6 +18168,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -18191,6 +18199,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -18213,8 +18222,8 @@
     ],
     cflags: [
         "-DCRYPTO_IMPLEMENTATION",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -18222,7 +18231,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -18258,10 +18267,14 @@
             ],
         },
         android_arm: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -18285,10 +18298,14 @@
             ],
         },
         android_arm64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -18313,10 +18330,14 @@
             ],
         },
         android_riscv64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -18339,10 +18360,14 @@
             ],
         },
         android_x86: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -18366,10 +18391,14 @@
             ],
         },
         android_x86_64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -18435,6 +18464,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -18465,6 +18495,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -18488,17 +18519,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -18595,6 +18627,7 @@
         "-Wno-unreachable-code-loop-increment",
         "-Wno-unused-parameter",
         "-fPIC",
+        "-fprofile-list=external/cronet/exclude_coverage.list",
     ],
     stl: "none",
     cpp_std: "c++17",
@@ -18820,7 +18853,7 @@
     srcs: [
         ":cronet_aml_net_android_net_android_java_enums_srcjar",
         ":cronet_aml_net_android_net_errors_java",
-        ":cronet_aml_net_net_jni_headers__java",
+        ":cronet_aml_net_net_jni_headers__action__java",
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
         "net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
@@ -18867,7 +18900,7 @@
     srcs: [
         ":cronet_aml_net_android_net_android_java_enums_srcjar__testing",
         ":cronet_aml_net_android_net_errors_java__testing",
-        ":cronet_aml_net_net_jni_headers__testing__java",
+        ":cronet_aml_net_net_jni_headers__action__testing__java",
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
         "net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
@@ -18913,7 +18946,7 @@
     name: "cronet_aml_net_android_net_java_test_support__testing",
     srcs: [
         ":cronet_aml_net_android_net_java_test_support_enums_srcjar__testing",
-        ":cronet_aml_net_android_net_test_support_jni__testing__java",
+        ":cronet_aml_net_android_net_test_support_jni__action__testing__java",
         "net/test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerRule.java",
@@ -18967,9 +19000,9 @@
     ],
 }
 
-// GN: //net/android:net_test_support_jni__testing
+// GN: //net/android:net_test_support_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_net_android_net_test_support_jni__testing",
+    name: "cronet_aml_net_android_net_test_support_jni__action__testing",
     srcs: [
         "net/test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java",
     ],
@@ -19007,9 +19040,9 @@
     ],
 }
 
-// GN: //net/android:net_test_support_jni__testing
+// GN: //net/android:net_test_support_jni__action__testing
 java_genrule {
-    name: "cronet_aml_net_android_net_test_support_jni__testing__java",
+    name: "cronet_aml_net_android_net_test_support_jni__action__testing__java",
     srcs: [
         "net/test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java",
     ],
@@ -19048,7 +19081,7 @@
 java_library {
     name: "cronet_aml_net_android_net_test_support_provider_java__testing",
     srcs: [
-        ":cronet_aml_net_android_net_test_support_provider_jni__testing__java",
+        ":cronet_aml_net_android_net_test_support_provider_jni__action__testing__java",
         "net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
         "net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticatorService.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
@@ -19073,9 +19106,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //net/android:net_test_support_provider_jni__testing
+// GN: //net/android:net_test_support_provider_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_net_android_net_test_support_provider_jni__testing",
+    name: "cronet_aml_net_android_net_test_support_provider_jni__action__testing",
     srcs: [
         "net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
@@ -19119,9 +19152,9 @@
     ],
 }
 
-// GN: //net/android:net_test_support_provider_jni__testing
+// GN: //net/android:net_test_support_provider_jni__action__testing
 java_genrule {
-    name: "cronet_aml_net_android_net_test_support_provider_jni__testing__java",
+    name: "cronet_aml_net_android_net_test_support_provider_jni__action__testing__java",
     srcs: [
         "net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
         "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
@@ -19166,7 +19199,7 @@
 java_library {
     name: "cronet_aml_net_android_net_tests_java__testing",
     srcs: [
-        ":cronet_aml_net_android_net_tests_jni__testing__java",
+        ":cronet_aml_net_android_net_tests_jni__action__testing__java",
         "net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
         "net/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTest.java",
         "net/android/javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java",
@@ -19205,9 +19238,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //net/android:net_tests_jni__testing
+// GN: //net/android:net_tests_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_net_android_net_tests_jni__testing",
+    name: "cronet_aml_net_android_net_tests_jni__action__testing",
     srcs: [
         "net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
         "net/android/javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java",
@@ -19251,9 +19284,9 @@
     ],
 }
 
-// GN: //net/android:net_tests_jni__testing
+// GN: //net/android:net_tests_jni__action__testing
 java_genrule {
-    name: "cronet_aml_net_android_net_tests_jni__testing__java",
+    name: "cronet_aml_net_android_net_tests_jni__action__testing__java",
     srcs: [
         "net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
         "net/android/javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java",
@@ -19648,6 +19681,7 @@
     name: "cronet_aml_net_constants",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -19660,21 +19694,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -19694,21 +19729,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -19726,17 +19762,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -19835,6 +19872,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -19864,6 +19902,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -19886,17 +19925,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20069,6 +20109,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -20083,21 +20124,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20114,12 +20156,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -20129,21 +20171,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20160,12 +20203,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -20173,8 +20216,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -20187,9 +20230,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20338,6 +20383,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -20359,12 +20405,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -20379,6 +20425,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -20400,12 +20447,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -20413,8 +20460,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -20427,9 +20474,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20518,6 +20567,7 @@
     name: "cronet_aml_net_dns_dns_client",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -20532,21 +20582,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20563,12 +20614,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -20578,21 +20629,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20609,12 +20661,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -20622,8 +20674,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -20636,9 +20688,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20744,6 +20798,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -20765,12 +20820,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -20785,6 +20840,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -20806,12 +20862,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -20819,8 +20875,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -20833,9 +20889,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -20924,6 +20982,7 @@
     name: "cronet_aml_net_dns_host_resolver",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -20938,21 +20997,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -20969,12 +21029,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -20984,21 +21044,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21015,12 +21076,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21028,8 +21089,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21042,9 +21103,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21150,6 +21213,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21171,12 +21235,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -21191,6 +21255,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21212,12 +21277,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21225,8 +21290,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21239,9 +21304,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21330,6 +21397,7 @@
     name: "cronet_aml_net_dns_host_resolver_manager",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -21344,21 +21412,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21375,12 +21444,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -21390,21 +21459,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21421,12 +21491,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21434,8 +21504,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21448,9 +21518,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21556,6 +21628,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21577,12 +21650,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -21597,6 +21670,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21618,12 +21692,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21631,8 +21705,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21645,9 +21719,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21736,6 +21812,7 @@
     name: "cronet_aml_net_dns_mdns_client",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -21750,21 +21827,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21781,12 +21859,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -21796,21 +21874,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -21827,12 +21906,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -21840,8 +21919,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -21854,9 +21933,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -21962,6 +22043,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -21983,12 +22065,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -22003,6 +22085,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22024,12 +22107,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22037,8 +22120,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -22051,9 +22134,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22153,6 +22238,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -22167,21 +22253,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -22198,12 +22285,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -22213,21 +22300,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -22244,12 +22332,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22257,8 +22345,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -22271,9 +22359,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22390,6 +22480,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22411,12 +22502,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -22431,6 +22522,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22452,12 +22544,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22465,8 +22557,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -22479,9 +22571,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22592,6 +22686,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22613,12 +22708,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -22633,6 +22728,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22654,12 +22750,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22667,8 +22763,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -22684,10 +22780,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22715,6 +22812,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -22801,6 +22899,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22822,12 +22921,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -22842,6 +22941,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -22863,12 +22963,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -22876,8 +22976,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -22893,10 +22993,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -22924,6 +23025,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -23037,6 +23139,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23046,8 +23149,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -23061,13 +23164,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -23082,6 +23185,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23091,8 +23195,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -23106,13 +23210,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -23121,8 +23225,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -23139,6 +23243,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -23149,7 +23254,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -23181,6 +23286,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -23306,6 +23412,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23315,8 +23422,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -23329,12 +23436,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -23349,6 +23456,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23358,8 +23466,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -23372,12 +23480,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -23386,8 +23494,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -23404,6 +23512,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
@@ -23413,7 +23522,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -23445,6 +23554,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -23511,6 +23621,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -23525,21 +23636,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -23556,12 +23668,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -23571,21 +23683,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -23602,12 +23715,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -23615,8 +23728,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -23629,9 +23742,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -23740,6 +23855,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23761,12 +23877,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -23781,6 +23897,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -23802,12 +23919,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -23815,8 +23932,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -23829,9 +23946,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -24011,8 +24130,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -24023,9 +24142,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -24108,8 +24228,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -24120,9 +24240,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -24382,34 +24503,6 @@
         "net/cert/merkle_tree_leaf.cc",
         "net/cert/multi_log_ct_verifier.cc",
         "net/cert/multi_threaded_cert_verifier.cc",
-        "net/cert/ocsp_verify_result.cc",
-        "net/cert/pem.cc",
-        "net/cert/pki/cert_error_id.cc",
-        "net/cert/pki/cert_error_params.cc",
-        "net/cert/pki/cert_errors.cc",
-        "net/cert/pki/cert_issuer_source_static.cc",
-        "net/cert/pki/certificate_policies.cc",
-        "net/cert/pki/common_cert_errors.cc",
-        "net/cert/pki/crl.cc",
-        "net/cert/pki/extended_key_usage.cc",
-        "net/cert/pki/general_names.cc",
-        "net/cert/pki/ip_util.cc",
-        "net/cert/pki/name_constraints.cc",
-        "net/cert/pki/ocsp.cc",
-        "net/cert/pki/parse_certificate.cc",
-        "net/cert/pki/parse_name.cc",
-        "net/cert/pki/parsed_certificate.cc",
-        "net/cert/pki/path_builder.cc",
-        "net/cert/pki/revocation_util.cc",
-        "net/cert/pki/signature_algorithm.cc",
-        "net/cert/pki/simple_path_builder_delegate.cc",
-        "net/cert/pki/string_util.cc",
-        "net/cert/pki/trust_store.cc",
-        "net/cert/pki/trust_store_collection.cc",
-        "net/cert/pki/trust_store_in_memory.cc",
-        "net/cert/pki/verify_certificate_chain.cc",
-        "net/cert/pki/verify_name_match.cc",
-        "net/cert/pki/verify_signed_data.cc",
         "net/cert/sct_status_flags.cc",
         "net/cert/signed_certificate_timestamp.cc",
         "net/cert/signed_certificate_timestamp_and_status.cc",
@@ -24442,11 +24535,6 @@
         "net/cookies/parsed_cookie.cc",
         "net/cookies/site_for_cookies.cc",
         "net/cookies/static_cookie_policy.cc",
-        "net/der/encode_values.cc",
-        "net/der/input.cc",
-        "net/der/parse_values.cc",
-        "net/der/parser.cc",
-        "net/der/tag.cc",
         "net/disk_cache/backend_cleanup_tracker.cc",
         "net/disk_cache/blockfile/addr.cc",
         "net/disk_cache/blockfile/backend_impl.cc",
@@ -24470,7 +24558,7 @@
         "net/disk_cache/memory/mem_backend_impl.cc",
         "net/disk_cache/memory/mem_entry_impl.cc",
         "net/disk_cache/net_log_parameters.cc",
-        "net/disk_cache/simple/post_doom_waiter.cc",
+        "net/disk_cache/simple/post_operation_waiter.cc",
         "net/disk_cache/simple/simple_backend_impl.cc",
         "net/disk_cache/simple/simple_entry_format.cc",
         "net/disk_cache/simple/simple_entry_impl.cc",
@@ -24497,6 +24585,8 @@
         "net/first_party_sets/first_party_sets_cache_filter.cc",
         "net/first_party_sets/first_party_sets_context_config.cc",
         "net/first_party_sets/global_first_party_sets.cc",
+        "net/first_party_sets/local_set_declaration.cc",
+        "net/first_party_sets/sets_mutation.cc",
         "net/http/alternative_service.cc",
         "net/http/bidirectional_stream.cc",
         "net/http/bidirectional_stream_impl.cc",
@@ -24525,6 +24615,7 @@
         "net/http/http_cache_transaction.cc",
         "net/http/http_cache_writers.cc",
         "net/http/http_chunked_decoder.cc",
+        "net/http/http_connection_info.cc",
         "net/http/http_content_disposition.cc",
         "net/http/http_log_util.cc",
         "net/http/http_network_layer.cc",
@@ -24759,6 +24850,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -24773,21 +24865,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -24804,12 +24897,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -24819,21 +24912,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -24850,12 +24944,12 @@
         "cronet_aml_net_buildflags",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_net_net_nqe_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -24863,8 +24957,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -24878,9 +24972,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -25096,34 +25192,6 @@
         "net/cert/merkle_tree_leaf.cc",
         "net/cert/multi_log_ct_verifier.cc",
         "net/cert/multi_threaded_cert_verifier.cc",
-        "net/cert/ocsp_verify_result.cc",
-        "net/cert/pem.cc",
-        "net/cert/pki/cert_error_id.cc",
-        "net/cert/pki/cert_error_params.cc",
-        "net/cert/pki/cert_errors.cc",
-        "net/cert/pki/cert_issuer_source_static.cc",
-        "net/cert/pki/certificate_policies.cc",
-        "net/cert/pki/common_cert_errors.cc",
-        "net/cert/pki/crl.cc",
-        "net/cert/pki/extended_key_usage.cc",
-        "net/cert/pki/general_names.cc",
-        "net/cert/pki/ip_util.cc",
-        "net/cert/pki/name_constraints.cc",
-        "net/cert/pki/ocsp.cc",
-        "net/cert/pki/parse_certificate.cc",
-        "net/cert/pki/parse_name.cc",
-        "net/cert/pki/parsed_certificate.cc",
-        "net/cert/pki/path_builder.cc",
-        "net/cert/pki/revocation_util.cc",
-        "net/cert/pki/signature_algorithm.cc",
-        "net/cert/pki/simple_path_builder_delegate.cc",
-        "net/cert/pki/string_util.cc",
-        "net/cert/pki/trust_store.cc",
-        "net/cert/pki/trust_store_collection.cc",
-        "net/cert/pki/trust_store_in_memory.cc",
-        "net/cert/pki/verify_certificate_chain.cc",
-        "net/cert/pki/verify_name_match.cc",
-        "net/cert/pki/verify_signed_data.cc",
         "net/cert/sct_status_flags.cc",
         "net/cert/signed_certificate_timestamp.cc",
         "net/cert/signed_certificate_timestamp_and_status.cc",
@@ -25156,11 +25224,6 @@
         "net/cookies/parsed_cookie.cc",
         "net/cookies/site_for_cookies.cc",
         "net/cookies/static_cookie_policy.cc",
-        "net/der/encode_values.cc",
-        "net/der/input.cc",
-        "net/der/parse_values.cc",
-        "net/der/parser.cc",
-        "net/der/tag.cc",
         "net/disk_cache/backend_cleanup_tracker.cc",
         "net/disk_cache/blockfile/addr.cc",
         "net/disk_cache/blockfile/backend_impl.cc",
@@ -25184,7 +25247,7 @@
         "net/disk_cache/memory/mem_backend_impl.cc",
         "net/disk_cache/memory/mem_entry_impl.cc",
         "net/disk_cache/net_log_parameters.cc",
-        "net/disk_cache/simple/post_doom_waiter.cc",
+        "net/disk_cache/simple/post_operation_waiter.cc",
         "net/disk_cache/simple/simple_backend_impl.cc",
         "net/disk_cache/simple/simple_entry_format.cc",
         "net/disk_cache/simple/simple_entry_impl.cc",
@@ -25211,6 +25274,8 @@
         "net/first_party_sets/first_party_sets_cache_filter.cc",
         "net/first_party_sets/first_party_sets_context_config.cc",
         "net/first_party_sets/global_first_party_sets.cc",
+        "net/first_party_sets/local_set_declaration.cc",
+        "net/first_party_sets/sets_mutation.cc",
         "net/http/alternative_service.cc",
         "net/http/bidirectional_stream.cc",
         "net/http/bidirectional_stream_impl.cc",
@@ -25239,6 +25304,7 @@
         "net/http/http_cache_transaction.cc",
         "net/http/http_cache_writers.cc",
         "net/http/http_chunked_decoder.cc",
+        "net/http/http_connection_info.cc",
         "net/http/http_content_disposition.cc",
         "net/http/http_log_util.cc",
         "net/http/http_network_layer.cc",
@@ -25490,6 +25556,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -25511,12 +25578,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -25531,6 +25598,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -25552,12 +25620,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -25565,8 +25633,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -25580,9 +25648,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -25686,6 +25756,7 @@
     name: "cronet_aml_net_net_deps",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -25700,21 +25771,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -25728,7 +25800,7 @@
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_url_buildflags",
     ],
     export_generated_headers: [
@@ -25739,21 +25811,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -25767,7 +25840,7 @@
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
         "cronet_aml_net_cronet_buildflags",
         "cronet_aml_net_isolation_info_proto_gen_headers",
-        "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_jni_headers__action",
         "cronet_aml_url_buildflags",
     ],
     defaults: [
@@ -25776,8 +25849,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -25790,9 +25863,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -25895,6 +25970,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -25913,7 +25989,7 @@
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_url_buildflags__testing",
     ],
     export_generated_headers: [
@@ -25929,6 +26005,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -25947,7 +26024,7 @@
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_url_buildflags__testing",
     ],
     defaults: [
@@ -25956,8 +26033,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DENABLE_BUILT_IN_DNS",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -25970,9 +26047,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -26053,9 +26132,9 @@
     },
 }
 
-// GN: //net:net_jni_headers
+// GN: //net:net_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_net_net_jni_headers",
+    name: "cronet_aml_net_net_jni_headers__action",
     srcs: [
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
@@ -26167,9 +26246,9 @@
     ],
 }
 
-// GN: //net:net_jni_headers
+// GN: //net:net_jni_headers__action
 java_genrule {
-    name: "cronet_aml_net_net_jni_headers__java",
+    name: "cronet_aml_net_net_jni_headers__action__java",
     srcs: [
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
@@ -26278,9 +26357,9 @@
     ],
 }
 
-// GN: //net:net_jni_headers__testing
+// GN: //net:net_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_net_net_jni_headers__testing",
+    name: "cronet_aml_net_net_jni_headers__action__testing",
     srcs: [
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
@@ -26390,9 +26469,9 @@
     ],
 }
 
-// GN: //net:net_jni_headers__testing
+// GN: //net:net_jni_headers__action__testing
 java_genrule {
-    name: "cronet_aml_net_net_jni_headers__testing__java",
+    name: "cronet_aml_net_net_jni_headers__action__testing__java",
     srcs: [
         "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
         "net/android/java/src/org/chromium/net/AndroidKeyStore.java",
@@ -26521,8 +26600,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -26534,9 +26613,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -26619,8 +26699,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -26632,9 +26712,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -26782,6 +26863,7 @@
     name: "cronet_aml_net_net_public_deps",
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -26796,21 +26878,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -26828,7 +26911,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -26838,21 +26921,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -26870,7 +26954,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -26878,8 +26962,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -26890,9 +26974,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -26997,6 +27082,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -27019,7 +27105,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -27034,6 +27120,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -27056,7 +27143,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -27064,8 +27151,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -27076,9 +27163,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -27242,33 +27330,6 @@
         "net/cert/merkle_tree_leaf_unittest.cc",
         "net/cert/multi_log_ct_verifier_unittest.cc",
         "net/cert/multi_threaded_cert_verifier_unittest.cc",
-        "net/cert/pem_unittest.cc",
-        "net/cert/pki/cert_issuer_source_static_unittest.cc",
-        "net/cert/pki/certificate_policies_unittest.cc",
-        "net/cert/pki/crl_unittest.cc",
-        "net/cert/pki/extended_key_usage_unittest.cc",
-        "net/cert/pki/general_names_unittest.cc",
-        "net/cert/pki/ip_util_unittest.cc",
-        "net/cert/pki/name_constraints_unittest.cc",
-        "net/cert/pki/nist_pkits_unittest.cc",
-        "net/cert/pki/ocsp_unittest.cc",
-        "net/cert/pki/parse_certificate_unittest.cc",
-        "net/cert/pki/parse_name_unittest.cc",
-        "net/cert/pki/parsed_certificate_unittest.cc",
-        "net/cert/pki/path_builder_pkits_unittest.cc",
-        "net/cert/pki/path_builder_unittest.cc",
-        "net/cert/pki/path_builder_verify_certificate_chain_unittest.cc",
-        "net/cert/pki/revocation_util_unittest.cc",
-        "net/cert/pki/signature_algorithm_unittest.cc",
-        "net/cert/pki/simple_path_builder_delegate_unittest.cc",
-        "net/cert/pki/string_util_unittest.cc",
-        "net/cert/pki/test_helpers.cc",
-        "net/cert/pki/trust_store_collection_unittest.cc",
-        "net/cert/pki/trust_store_unittest.cc",
-        "net/cert/pki/verify_certificate_chain_pkits_unittest.cc",
-        "net/cert/pki/verify_certificate_chain_unittest.cc",
-        "net/cert/pki/verify_name_match_unittest.cc",
-        "net/cert/pki/verify_signed_data_unittest.cc",
         "net/cert/signed_certificate_timestamp_unittest.cc",
         "net/cert/symantec_certs_unittest.cc",
         "net/cert/test_root_certs_unittest.cc",
@@ -27288,10 +27349,6 @@
         "net/cookies/parsed_cookie_unittest.cc",
         "net/cookies/site_for_cookies_unittest.cc",
         "net/cookies/static_cookie_policy_unittest.cc",
-        "net/der/encode_values_unittest.cc",
-        "net/der/input_unittest.cc",
-        "net/der/parse_values_unittest.cc",
-        "net/der/parser_unittest.cc",
         "net/disk_cache/backend_cleanup_tracker_unittest.cc",
         "net/disk_cache/backend_unittest.cc",
         "net/disk_cache/blockfile/addr_unittest.cc",
@@ -27317,6 +27374,8 @@
         "net/first_party_sets/first_party_sets_cache_filter_unittest.cc",
         "net/first_party_sets/first_party_sets_context_config_unittest.cc",
         "net/first_party_sets/global_first_party_sets_unittest.cc",
+        "net/first_party_sets/local_set_declaration_unittest.cc",
+        "net/first_party_sets/sets_mutation_unittest.cc",
         "net/http/alternative_service_unittest.cc",
         "net/http/bidirectional_stream_unittest.cc",
         "net/http/broken_alternative_services_unittest.cc",
@@ -27359,6 +27418,7 @@
         "net/http/http_stream_factory_unittest.cc",
         "net/http/http_stream_parser_unittest.cc",
         "net/http/http_stream_request_unittest.cc",
+        "net/http/http_transaction_test_util_unittest.cc",
         "net/http/http_util_unittest.cc",
         "net/http/http_vary_data_unittest.cc",
         "net/http/mock_allow_http_auth_preferences.cc",
@@ -27523,7 +27583,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -27680,6 +27739,7 @@
         "cronet_aml_third_party_googletest_gtest__testing",
         "cronet_aml_third_party_icu_icui18n__testing",
         "cronet_aml_third_party_icu_icuuc_private__testing",
+        "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
         "cronet_aml_third_party_libevent_libevent__testing",
         "cronet_aml_third_party_libxml_libxml__testing",
         "cronet_aml_third_party_libxml_libxml_utils__testing",
@@ -27687,21 +27747,22 @@
         "cronet_aml_third_party_modp_b64_modp_b64__testing",
         "cronet_aml_third_party_protobuf_protobuf_lite__testing",
         "cronet_aml_third_party_quic_trace_quic_trace_proto__testing",
+        "cronet_aml_third_party_re2_re2__testing",
         "cronet_aml_url_url__testing",
     ],
     generated_headers: [
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
-        "cronet_aml_net_android_net_test_support_jni__testing",
-        "cronet_aml_net_android_net_test_support_provider_jni__testing",
-        "cronet_aml_net_android_net_tests_jni__testing",
+        "cronet_aml_net_android_net_test_support_jni__action__testing",
+        "cronet_aml_net_android_net_test_support_provider_jni__action__testing",
+        "cronet_aml_net_android_net_tests_jni__action__testing",
         "cronet_aml_net_base_registry_controlled_domains_lookup_strings_test_sets__testing",
         "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_url_buildflags__testing",
     ],
     defaults: [
@@ -27711,8 +27772,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -27729,7 +27790,9 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
         "-DU_ENABLE_DYLOAD=0",
@@ -27739,7 +27802,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -27773,6 +27836,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -27844,6 +27908,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -27856,21 +27921,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -27890,21 +27956,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -27922,17 +27989,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28034,6 +28102,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28063,6 +28132,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28085,17 +28155,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28199,6 +28270,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28220,12 +28292,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -28240,6 +28312,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28261,12 +28334,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -28274,8 +28347,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -28286,9 +28359,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28402,6 +28476,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28411,8 +28486,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -28426,13 +28501,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -28447,6 +28522,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28456,8 +28532,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -28471,13 +28547,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -28486,8 +28562,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -28504,6 +28580,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -28514,7 +28591,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28546,6 +28623,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -28635,6 +28713,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28656,13 +28735,13 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -28677,6 +28756,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28698,13 +28778,13 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -28712,8 +28792,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -28724,9 +28804,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28834,6 +28915,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28855,12 +28937,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -28875,6 +28957,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -28896,12 +28979,12 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -28909,8 +28992,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -28926,10 +29009,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -28957,6 +29041,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -29026,10 +29111,10 @@
         "net/base/mock_network_change_notifier.cc",
         "net/base/test_completion_callback.cc",
         "net/base/test_data_stream.cc",
+        "net/cert/internal/test_helpers.cc",
         "net/cert/mock_cert_net_fetcher.cc",
         "net/cert/mock_cert_verifier.cc",
         "net/cert/mock_client_cert_verifier.cc",
-        "net/cert/pki/mock_signature_verify_cache.cc",
         "net/cookies/cookie_change_dispatcher_test_helpers.cc",
         "net/cookies/cookie_monster_store_test.cc",
         "net/cookies/cookie_store_test_callbacks.cc",
@@ -29115,6 +29200,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29124,8 +29210,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -29139,13 +29225,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -29160,6 +29246,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29169,8 +29256,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -29184,13 +29271,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -29199,8 +29286,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -29217,6 +29304,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -29227,7 +29315,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -29259,6 +29347,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -29343,6 +29432,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29363,7 +29453,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -29378,6 +29468,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29398,7 +29489,7 @@
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -29406,8 +29497,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -29419,9 +29510,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -29530,6 +29622,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29561,6 +29654,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29585,8 +29679,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -29598,9 +29692,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -29777,6 +29872,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29786,8 +29882,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -29801,7 +29897,7 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_blind_sign_auth_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
@@ -29809,7 +29905,7 @@
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -29824,6 +29920,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -29833,8 +29930,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -29848,7 +29945,7 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_blind_sign_auth_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
@@ -29856,7 +29953,7 @@
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -29865,8 +29962,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -29877,9 +29974,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -29973,6 +30071,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -29986,21 +30085,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -30021,21 +30121,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -30054,8 +30155,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -30067,9 +30168,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -30173,6 +30275,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -30203,6 +30306,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -30226,8 +30330,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -30239,9 +30343,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -30441,8 +30546,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -30454,9 +30559,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -30539,8 +30645,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -30552,9 +30658,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -30998,9 +31105,12 @@
         "net/third_party/quiche/src/quiche/spdy/core/spdy_prefixed_buffer_reader.cc",
         "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.cc",
         "net/third_party/quiche/src/quiche/web_transport/complete_buffer_visitor.cc",
+        "net/third_party/quiche/src/quiche/web_transport/encapsulated/encapsulated_web_transport.cc",
+        "net/third_party/quiche/src/quiche/web_transport/web_transport_headers.cc",
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -31015,21 +31125,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -31043,7 +31154,7 @@
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -31053,21 +31164,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -31081,7 +31193,7 @@
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -31089,8 +31201,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -31102,9 +31214,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -31486,6 +31599,8 @@
         "net/third_party/quiche/src/quiche/spdy/core/spdy_prefixed_buffer_reader.cc",
         "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.cc",
         "net/third_party/quiche/src/quiche/web_transport/complete_buffer_visitor.cc",
+        "net/third_party/quiche/src/quiche/web_transport/encapsulated/encapsulated_web_transport.cc",
+        "net/third_party/quiche/src/quiche/web_transport/web_transport_headers.cc",
     ],
     shared_libs: [
         "libandroid",
@@ -31506,6 +31621,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -31524,7 +31640,7 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -31539,6 +31655,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -31557,7 +31674,7 @@
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -31565,8 +31682,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -31578,9 +31695,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -31781,6 +31899,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -31790,8 +31909,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -31805,13 +31924,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -31826,6 +31945,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -31835,8 +31955,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -31850,13 +31970,13 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -31865,8 +31985,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -31883,6 +32003,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-DUSE_CHROMIUM_ICU=1",
         "-DUSE_REMOTE_TEST_SERVER",
@@ -31893,7 +32014,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -31925,6 +32046,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -32248,6 +32370,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32257,8 +32380,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -32272,7 +32395,7 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_blind_sign_auth_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
@@ -32280,7 +32403,7 @@
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -32295,6 +32418,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32304,8 +32428,8 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
@@ -32319,7 +32443,7 @@
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_blind_sign_auth_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
@@ -32327,7 +32451,7 @@
         "cronet_aml_third_party_anonymous_tokens_anonymous_tokens_cc_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -32336,8 +32460,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -32353,10 +32477,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -32387,6 +32512,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -32472,6 +32598,7 @@
         "net/third_party/quiche/src/quiche/quic/tools/quic_tcp_like_trace_converter.cc",
         "net/third_party/quiche/src/quiche/quic/tools/quic_url.cc",
         "net/third_party/quiche/src/quiche/quic/tools/simple_ticket_crypter.cc",
+        "net/third_party/quiche/src/quiche/quic/tools/web_transport_only_backend.cc",
     ],
     shared_libs: [
         "libandroid",
@@ -32492,6 +32619,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32513,13 +32641,13 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -32534,6 +32662,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32555,13 +32684,13 @@
         "cronet_aml_net_buildflags__testing",
         "cronet_aml_net_cronet_buildflags__testing",
         "cronet_aml_net_isolation_info_proto_gen__testing_headers",
-        "cronet_aml_net_net_jni_headers__testing",
+        "cronet_aml_net_net_jni_headers__action__testing",
         "cronet_aml_net_net_nqe_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_proto_gen__testing_headers",
         "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen__testing_headers",
         "cronet_aml_third_party_quic_trace_quic_trace_proto_gen__testing_headers",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -32569,8 +32698,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -32581,9 +32710,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -32690,6 +32820,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32719,6 +32850,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32739,8 +32871,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -32748,7 +32880,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -32784,10 +32916,14 @@
             ],
         },
         android_arm: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -32811,10 +32947,14 @@
             ],
         },
         android_arm64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -32839,10 +32979,14 @@
             ],
         },
         android_riscv64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -32865,10 +33009,14 @@
             ],
         },
         android_x86: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -32892,10 +33040,14 @@
             ],
         },
         android_x86_64: {
+            shared_libs: [
+                "liblog",
+            ],
             cflags: [
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -32961,6 +33113,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -32978,7 +33131,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -32993,6 +33146,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33010,7 +33164,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -33018,17 +33172,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33117,7 +33272,6 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_base__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_core__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_allocator_shim__testing",
-        "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc__testing",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr__testing",
         "cronet_aml_base_base__testing",
         "cronet_aml_base_base_static__testing",
@@ -33211,8 +33365,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
@@ -33228,7 +33382,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33287,6 +33441,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33316,6 +33471,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33336,8 +33492,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
@@ -33353,7 +33509,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33405,6 +33561,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33434,6 +33591,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33456,17 +33614,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33550,6 +33709,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -33562,21 +33722,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -33596,21 +33757,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -33628,17 +33790,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33740,6 +33903,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33769,6 +33933,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -33791,17 +33956,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -33888,6 +34054,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -33900,21 +34067,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -33934,21 +34102,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -33966,8 +34135,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_URI_TEMPLATE_IMPL",
@@ -33975,9 +34144,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34079,6 +34249,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34108,6 +34279,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34130,8 +34302,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_URI_TEMPLATE_IMPL",
@@ -34139,9 +34311,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34224,7 +34397,7 @@
 java_library {
     name: "cronet_aml_testing_android_native_test_native_main_runner_java__testing",
     srcs: [
-        ":cronet_aml_testing_android_native_test_native_main_runner_jni__testing__java",
+        ":cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing__java",
         "testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java",
     ],
     static_libs: [
@@ -34238,9 +34411,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //testing/android/native_test:native_main_runner_jni__testing
+// GN: //testing/android/native_test:native_main_runner_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
+    name: "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
     srcs: [
         "testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java",
     ],
@@ -34278,9 +34451,9 @@
     ],
 }
 
-// GN: //testing/android/native_test:native_main_runner_jni__testing
+// GN: //testing/android/native_test:native_main_runner_jni__action__testing
 java_genrule {
-    name: "cronet_aml_testing_android_native_test_native_main_runner_jni__testing__java",
+    name: "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing__java",
     srcs: [
         "testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java",
     ],
@@ -34319,7 +34492,7 @@
 java_library {
     name: "cronet_aml_testing_android_native_test_native_test_java__testing",
     srcs: [
-        ":cronet_aml_testing_android_native_test_native_test_jni__testing__java",
+        ":cronet_aml_testing_android_native_test_native_test_jni__action__testing__java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTest.java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTestApplication.java",
@@ -34352,9 +34525,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //testing/android/native_test:native_test_jni__testing
+// GN: //testing/android/native_test:native_test_jni__action__testing
 cc_genrule {
-    name: "cronet_aml_testing_android_native_test_native_test_jni__testing",
+    name: "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     srcs: [
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTest.java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java",
@@ -34398,9 +34571,9 @@
     ],
 }
 
-// GN: //testing/android/native_test:native_test_jni__testing
+// GN: //testing/android/native_test:native_test_jni__action__testing
 java_genrule {
-    name: "cronet_aml_testing_android_native_test_native_test_jni__testing__java",
+    name: "cronet_aml_testing_android_native_test_native_test_jni__action__testing__java",
     srcs: [
         "testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTest.java",
         "testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java",
@@ -34465,6 +34638,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34474,16 +34648,16 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
-        "cronet_aml_testing_android_native_test_native_test_jni__testing",
+        "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
+        "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -34498,6 +34672,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34507,16 +34682,16 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
-        "cronet_aml_testing_android_native_test_native_test_jni__testing",
+        "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
+        "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -34525,17 +34700,18 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34641,6 +34817,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34650,16 +34827,16 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
-        "cronet_aml_testing_android_native_test_native_test_jni__testing",
+        "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
+        "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -34674,6 +34851,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34683,16 +34861,16 @@
         "cronet_aml_base_rust_buildflags__testing",
         "cronet_aml_base_sanitizer_buildflags__testing",
         "cronet_aml_base_synchronization_buildflags__testing",
-        "cronet_aml_base_test_base_unittests_jni_headers__testing",
-        "cronet_aml_base_test_test_support_jni_headers__testing",
+        "cronet_aml_base_test_base_unittests_jni_headers__action__testing",
+        "cronet_aml_base_test_test_support_jni_headers__action__testing",
         "cronet_aml_base_tracing_buildflags__testing",
         "cronet_aml_build_blink_buildflags__testing",
         "cronet_aml_build_branding_buildflags__testing",
         "cronet_aml_build_chromecast_buildflags__testing",
         "cronet_aml_build_chromeos_buildflags__testing",
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-        "cronet_aml_testing_android_native_test_native_main_runner_jni__testing",
-        "cronet_aml_testing_android_native_test_native_test_jni__testing",
+        "cronet_aml_testing_android_native_test_native_main_runner_jni__action__testing",
+        "cronet_aml_testing_android_native_test_native_test_jni__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -34701,8 +34879,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -34715,7 +34893,9 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
+        "-DUSE_CHROMIUM_BASE",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -34724,7 +34904,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34752,6 +34932,7 @@
         "third_party/icu/source/i18n/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -34850,6 +35031,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34879,6 +35061,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -34901,8 +35084,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -34914,9 +35097,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -34938,6 +35122,7 @@
         "third_party/googletest/src/googletest/include/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -35020,6 +35205,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -35049,6 +35235,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -35071,8 +35258,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -35084,10 +35271,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -35108,6 +35296,7 @@
         "third_party/googletest/src/googletest/include/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -35184,17 +35373,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -35269,8 +35459,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -35278,7 +35468,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -35314,6 +35504,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -35324,6 +35515,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -35335,6 +35527,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35344,6 +35537,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -35354,6 +35548,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -35396,17 +35591,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -35477,8 +35673,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -35486,7 +35682,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -35515,6 +35711,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35524,6 +35721,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -35534,6 +35732,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35543,6 +35742,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -35552,6 +35752,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -35588,17 +35789,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -35665,8 +35867,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -35674,7 +35876,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -35703,6 +35905,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35712,6 +35915,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -35722,6 +35926,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35731,6 +35936,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -35740,6 +35946,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -35776,17 +35983,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -35853,8 +36061,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -35862,7 +36070,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -35891,6 +36099,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35900,6 +36109,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -35910,6 +36120,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -35919,6 +36130,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -35928,6 +36140,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -35964,17 +36177,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36041,8 +36255,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36050,7 +36264,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36079,6 +36293,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36088,6 +36303,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36098,6 +36314,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36107,6 +36324,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36116,6 +36334,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36152,17 +36371,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36229,8 +36449,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36238,7 +36458,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36267,6 +36487,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36276,6 +36497,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36286,6 +36508,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36295,6 +36518,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36304,6 +36528,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36340,17 +36565,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36417,8 +36643,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36426,7 +36652,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36455,6 +36681,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36464,6 +36691,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36474,6 +36702,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36483,6 +36712,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36492,6 +36722,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36528,17 +36759,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36605,8 +36837,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36614,7 +36846,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36643,6 +36875,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36652,6 +36885,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36662,6 +36896,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36671,6 +36906,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36680,6 +36916,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36717,17 +36954,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36795,8 +37033,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36804,7 +37042,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -36833,6 +37071,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36842,6 +37081,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -36852,6 +37092,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -36861,6 +37102,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -36870,6 +37112,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -36906,17 +37149,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -36983,8 +37227,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -36992,7 +37236,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37021,6 +37265,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37030,6 +37275,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37040,6 +37286,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37049,6 +37296,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37058,6 +37306,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37094,17 +37343,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37171,8 +37421,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37180,7 +37430,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37209,6 +37459,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37218,6 +37469,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37228,6 +37480,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37237,6 +37490,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37246,6 +37500,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37285,17 +37540,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37365,8 +37621,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37374,7 +37630,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37403,6 +37659,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37412,6 +37669,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37422,6 +37680,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37431,6 +37690,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37440,6 +37700,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37476,17 +37737,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37553,8 +37815,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37562,7 +37824,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37591,6 +37853,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37600,6 +37863,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37610,6 +37874,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37619,6 +37884,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37628,6 +37894,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37665,17 +37932,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37743,8 +38011,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37752,7 +38020,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37781,6 +38049,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37790,6 +38059,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37800,6 +38070,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37809,6 +38080,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -37818,6 +38090,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -37856,17 +38129,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -37935,8 +38209,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -37944,7 +38218,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -37973,6 +38247,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -37982,6 +38257,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -37992,6 +38268,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38001,6 +38278,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38010,6 +38288,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38046,17 +38325,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38123,8 +38403,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38132,7 +38412,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38161,6 +38441,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38170,6 +38451,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38180,6 +38462,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38189,6 +38472,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38198,6 +38482,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38234,17 +38519,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38311,8 +38597,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38320,7 +38606,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38349,6 +38635,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38358,6 +38645,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38368,6 +38656,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38377,6 +38666,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38386,6 +38676,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38422,17 +38713,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38499,8 +38791,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38508,7 +38800,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38537,6 +38829,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38546,6 +38839,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38556,6 +38850,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38565,6 +38860,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38574,6 +38870,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38610,17 +38907,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38687,8 +38985,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38696,7 +38994,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38725,6 +39023,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38734,6 +39033,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38744,6 +39044,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38753,6 +39054,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38762,6 +39064,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38798,17 +39101,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -38875,8 +39179,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -38884,7 +39188,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -38913,6 +39217,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38922,6 +39227,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -38932,6 +39238,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -38941,6 +39248,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -38950,6 +39258,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -38986,17 +39295,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39063,8 +39373,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39072,7 +39382,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39101,6 +39411,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39110,6 +39421,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39120,6 +39432,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39129,6 +39442,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39138,6 +39452,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39174,17 +39489,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39251,8 +39567,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39260,7 +39576,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39289,6 +39605,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39298,6 +39615,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39308,6 +39626,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39317,6 +39636,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39326,6 +39646,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39362,17 +39683,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39439,8 +39761,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39448,7 +39770,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39477,6 +39799,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39486,6 +39809,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39496,6 +39820,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39505,6 +39830,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39514,6 +39840,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39553,17 +39880,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39630,8 +39958,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39639,7 +39967,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39673,6 +40001,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39682,6 +40011,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39692,6 +40022,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39701,6 +40032,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39710,6 +40042,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39746,17 +40079,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -39823,8 +40157,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -39832,7 +40166,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -39861,6 +40195,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39870,6 +40205,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -39880,6 +40216,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -39889,6 +40226,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -39898,6 +40236,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -39937,17 +40276,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40014,8 +40354,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40023,7 +40363,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40057,6 +40397,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40066,6 +40407,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40076,6 +40418,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40085,6 +40428,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40094,6 +40438,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40130,17 +40475,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40207,8 +40553,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40216,7 +40562,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40245,6 +40591,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40254,6 +40601,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40264,6 +40612,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40273,6 +40622,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40282,6 +40632,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40318,17 +40669,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40395,8 +40747,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40404,7 +40756,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40433,6 +40785,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40442,6 +40795,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40452,6 +40806,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40461,6 +40816,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40470,6 +40826,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40506,17 +40863,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40583,8 +40941,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40592,7 +40950,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40621,6 +40979,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40630,6 +40989,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40640,6 +41000,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40649,6 +41010,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40658,6 +41020,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40697,17 +41060,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40774,8 +41138,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40783,7 +41147,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -40817,6 +41181,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40826,6 +41191,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -40836,6 +41202,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -40845,6 +41212,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -40854,6 +41222,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -40893,17 +41262,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -40970,8 +41340,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -40979,7 +41349,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41013,6 +41383,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41022,6 +41393,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41032,6 +41404,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41041,6 +41414,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41050,6 +41424,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41086,17 +41461,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41163,8 +41539,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41172,7 +41548,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41201,6 +41577,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41210,6 +41587,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41220,6 +41598,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41229,6 +41608,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41238,6 +41618,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41274,17 +41655,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41351,8 +41733,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41360,7 +41742,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41389,6 +41771,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41398,6 +41781,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41408,6 +41792,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41417,6 +41802,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41426,6 +41812,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41462,17 +41849,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41539,8 +41927,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41548,7 +41936,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41577,6 +41965,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41586,6 +41975,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41596,6 +41986,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41605,6 +41996,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41614,6 +42006,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41650,17 +42043,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41727,8 +42121,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41736,7 +42130,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41765,6 +42159,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41774,6 +42169,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41784,6 +42180,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41793,6 +42190,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41802,6 +42200,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -41838,17 +42237,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -41915,8 +42315,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -41924,7 +42324,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -41953,6 +42353,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41962,6 +42363,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -41972,6 +42374,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -41981,6 +42384,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -41990,6 +42394,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42026,17 +42431,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42103,8 +42509,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42112,7 +42518,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42141,6 +42547,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42150,6 +42557,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42160,6 +42568,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42169,6 +42578,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42178,6 +42588,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42215,17 +42626,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42293,8 +42705,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42302,7 +42714,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42331,6 +42743,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42340,6 +42753,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42350,6 +42764,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42359,6 +42774,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42368,6 +42784,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42407,17 +42824,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42487,8 +42905,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42496,7 +42914,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42525,6 +42943,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42534,6 +42953,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42544,6 +42964,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42553,6 +42974,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42562,6 +42984,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42604,17 +43027,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42687,8 +43111,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42696,7 +43120,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42725,6 +43149,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42734,6 +43159,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42744,6 +43170,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42753,6 +43180,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42762,6 +43190,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -42804,17 +43233,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -42887,8 +43317,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -42896,7 +43326,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -42925,6 +43355,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42934,6 +43365,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -42944,6 +43376,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -42953,6 +43386,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -42962,6 +43396,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43004,17 +43439,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43087,8 +43523,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43096,7 +43532,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43125,6 +43561,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43134,6 +43571,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43144,6 +43582,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43153,6 +43592,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43162,6 +43602,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43201,17 +43642,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43281,8 +43723,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43290,7 +43732,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43319,6 +43761,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43328,6 +43771,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43338,6 +43782,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43347,6 +43792,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43356,6 +43802,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43398,17 +43845,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43481,8 +43929,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43490,7 +43938,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43519,6 +43967,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43528,6 +43977,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43538,6 +43988,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43547,6 +43998,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43556,6 +44008,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43598,17 +44051,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43681,8 +44135,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43690,7 +44144,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43719,6 +44173,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43728,6 +44183,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43738,6 +44194,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43747,6 +44204,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43756,6 +44214,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43798,17 +44257,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -43881,8 +44341,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -43890,7 +44350,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -43919,6 +44379,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43928,6 +44389,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -43938,6 +44400,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -43947,6 +44410,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -43956,6 +44420,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -43992,17 +44457,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44069,8 +44535,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44078,7 +44544,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44107,6 +44573,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44116,6 +44583,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44126,6 +44594,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44135,6 +44604,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44144,6 +44614,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44183,17 +44654,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44263,8 +44735,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44272,7 +44744,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44301,6 +44773,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44310,6 +44783,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44320,6 +44794,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44329,6 +44804,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44338,6 +44814,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44374,17 +44851,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44451,8 +44929,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44460,7 +44938,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44489,6 +44967,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44498,6 +44977,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44508,6 +44988,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44517,6 +44998,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44526,6 +45008,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44568,17 +45051,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44651,8 +45135,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44660,7 +45144,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44689,6 +45173,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44698,6 +45183,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44708,6 +45194,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44717,6 +45204,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44726,6 +45214,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44764,17 +45253,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -44843,8 +45333,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -44852,7 +45342,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -44881,6 +45371,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44890,6 +45381,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -44900,6 +45392,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -44909,6 +45402,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -44918,6 +45412,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -44954,17 +45449,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45031,8 +45527,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45040,7 +45536,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45069,6 +45565,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45078,6 +45575,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45088,6 +45586,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45097,6 +45596,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45106,6 +45606,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45144,17 +45645,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45223,8 +45725,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45232,7 +45734,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45261,6 +45763,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45270,6 +45773,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45280,6 +45784,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45289,6 +45794,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45298,6 +45804,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45339,17 +45846,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45421,8 +45929,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45430,7 +45938,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45459,6 +45967,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45468,6 +45977,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45478,6 +45988,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45487,6 +45998,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45496,6 +46008,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45532,17 +46045,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45609,8 +46123,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45618,7 +46132,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45647,6 +46161,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45656,6 +46171,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45666,6 +46182,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45675,6 +46192,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45684,6 +46202,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45720,17 +46239,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45797,8 +46317,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45806,7 +46326,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -45835,6 +46355,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45844,6 +46365,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -45854,6 +46376,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -45863,6 +46386,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -45872,6 +46396,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -45908,17 +46433,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -45985,8 +46511,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -45994,7 +46520,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46023,6 +46549,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46032,6 +46559,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46042,6 +46570,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46051,6 +46580,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46060,6 +46590,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46098,17 +46629,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46177,8 +46709,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46186,7 +46718,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46215,6 +46747,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46224,6 +46757,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46234,6 +46768,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46243,6 +46778,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46252,6 +46788,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46293,17 +46830,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46375,8 +46913,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46384,7 +46922,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46413,6 +46951,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46422,6 +46961,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46432,6 +46972,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46441,6 +46982,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46450,6 +46992,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46486,17 +47029,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46563,8 +47107,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46572,7 +47116,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46601,6 +47145,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46610,6 +47155,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46620,6 +47166,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46629,6 +47176,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46638,6 +47186,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46687,17 +47236,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46777,8 +47327,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46786,7 +47336,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -46815,6 +47365,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46824,6 +47375,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -46834,6 +47386,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -46843,6 +47396,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -46852,6 +47406,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -46888,17 +47443,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -46965,8 +47521,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -46974,7 +47530,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47003,6 +47559,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47012,6 +47569,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47022,6 +47580,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47031,6 +47590,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47040,6 +47600,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47076,17 +47637,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47153,8 +47715,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47162,7 +47724,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47191,6 +47753,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47200,6 +47763,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47210,6 +47774,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47219,6 +47784,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47228,6 +47794,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47275,17 +47842,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47363,8 +47931,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47372,7 +47940,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47401,6 +47969,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47410,6 +47979,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47420,6 +47990,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47429,6 +48000,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47438,6 +48010,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47474,17 +48047,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47551,8 +48125,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47560,7 +48134,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47589,6 +48163,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47598,6 +48173,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47608,6 +48184,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47617,6 +48194,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47626,6 +48204,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47670,17 +48249,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47755,8 +48335,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47764,7 +48344,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47793,6 +48373,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47802,6 +48383,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -47812,6 +48394,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47821,6 +48404,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -47830,6 +48414,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -47870,17 +48455,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -47951,8 +48537,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -47960,7 +48546,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -47989,6 +48575,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -47998,6 +48585,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -48008,6 +48596,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48017,6 +48606,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -48026,6 +48616,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -48062,17 +48653,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -48139,8 +48731,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -48148,7 +48740,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -48177,6 +48769,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48186,6 +48779,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -48196,6 +48790,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48205,6 +48800,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -48214,6 +48810,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -48250,17 +48847,18 @@
         "-DABSL_ALLOCATOR_NOTHROW=1",
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -48327,8 +48925,8 @@
     ],
     cflags: [
         "-DABSL_ALLOCATOR_NOTHROW=1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -48336,7 +48934,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -48365,6 +48963,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48374,6 +48973,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -48384,6 +48984,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -48393,6 +48994,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -48402,6 +49004,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -48447,8 +49050,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48459,9 +49062,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48587,8 +49191,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48599,9 +49203,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48690,8 +49295,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48702,9 +49307,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48792,8 +49398,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48804,9 +49410,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48894,8 +49501,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -48906,9 +49513,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -48999,6 +49607,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -49029,6 +49638,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -49052,8 +49662,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49064,9 +49674,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49182,6 +49793,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -49212,6 +49824,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -49235,8 +49848,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49252,10 +49865,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUNIT_TEST",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49281,6 +49895,7 @@
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
         "third_party/protobuf/src/",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -49357,17 +49972,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49448,17 +50064,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49539,17 +50156,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49636,8 +50254,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49648,9 +50266,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49739,8 +50358,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49751,9 +50370,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49841,8 +50461,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49853,9 +50473,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -49944,8 +50565,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -49956,9 +50577,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50047,8 +50669,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -50059,9 +50681,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50150,8 +50773,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -50162,9 +50785,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50247,17 +50871,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50341,17 +50966,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50433,17 +51059,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50594,8 +51221,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
@@ -50603,9 +51230,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTRERROR_R_RC_INT",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-Wno-incompatible-pointer-types-discards-qualifiers",
@@ -50674,17 +51302,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50756,17 +51385,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -50977,6 +51607,13 @@
         "third_party/boringssl/src/crypto/rsa_extra/rsa_crypt.c",
         "third_party/boringssl/src/crypto/rsa_extra/rsa_print.c",
         "third_party/boringssl/src/crypto/siphash/siphash.c",
+        "third_party/boringssl/src/crypto/spx/address.c",
+        "third_party/boringssl/src/crypto/spx/fors.c",
+        "third_party/boringssl/src/crypto/spx/merkle.c",
+        "third_party/boringssl/src/crypto/spx/spx.c",
+        "third_party/boringssl/src/crypto/spx/spx_util.c",
+        "third_party/boringssl/src/crypto/spx/thash.c",
+        "third_party/boringssl/src/crypto/spx/wots.c",
         "third_party/boringssl/src/crypto/stack/stack.c",
         "third_party/boringssl/src/crypto/thread.c",
         "third_party/boringssl/src/crypto/thread_none.c",
@@ -51139,8 +51776,8 @@
         "-DBORINGSSL_ALLOW_CXX_RUNTIME",
         "-DBORINGSSL_IMPLEMENTATION",
         "-DBORINGSSL_NO_STATIC_INITIALIZER",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -51150,8 +51787,9 @@
         "-D_BORINGSSL_LIBPKI_",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-O2",
         "-fdata-sections",
         "-ffunction-sections",
         "-fno-asynchronous-unwind-tables",
@@ -51179,7 +51817,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -51188,7 +51826,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -51198,7 +51836,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -51207,7 +51845,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
         },
@@ -51216,7 +51854,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
-                "-Oz",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -51230,7 +51868,6 @@
                 "-D_FILE_OFFSET_BITS=64",
                 "-D_LARGEFILE64_SOURCE",
                 "-D_LARGEFILE_SOURCE",
-                "-O2",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -51387,8 +52024,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -51396,7 +52033,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -51427,6 +52064,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -51437,6 +52075,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -51448,6 +52087,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -51457,6 +52097,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -51467,6 +52108,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -51509,17 +52151,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -51597,17 +52240,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -51683,17 +52327,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -51763,17 +52408,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -51844,8 +52490,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DCOMPILER_GCC",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DHTML5_MODE",
@@ -51853,9 +52499,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -51925,8 +52572,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_STRONG_GETAUXVAL",
         "-DHAVE_SYS_UIO_H",
@@ -51935,9 +52582,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52034,8 +52682,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_STRONG_GETAUXVAL",
         "-DHAVE_SYS_UIO_H",
@@ -52044,9 +52692,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52140,8 +52789,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_STRONG_GETAUXVAL",
         "-DHAVE_SYS_UIO_H",
@@ -52150,9 +52799,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52226,8 +52876,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_STRONG_GETAUXVAL",
         "-DHAVE_SYS_UIO_H",
@@ -52236,9 +52886,10 @@
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
         "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52331,8 +52982,8 @@
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
         "-DBENCHMARK_STATIC_DEFINE",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_GNU_POSIX_REGEX=0",
         "-DHAVE_POSIX_REGEX=0",
@@ -52342,9 +52993,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Dbenchmark_EXPORTS=1",
         "-Oz",
@@ -52427,6 +53079,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -52456,6 +53109,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -52478,8 +53132,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -52491,9 +53145,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -52515,6 +53170,7 @@
         "third_party/googletest/src/googletest/include/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -52606,6 +53262,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -52635,6 +53292,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -52657,8 +53315,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGTEST_API_=",
         "-DGTEST_HAS_ABSL=1",
@@ -52670,9 +53328,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -52694,6 +53353,7 @@
         "third_party/googletest/src/googletest/include/",
         "third_party/libc++/src/include",
         "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
     ],
     cpp_std: "c++20",
     ldflags: [
@@ -53002,8 +53662,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_DLOPEN=0",
         "-DHAVE_SYS_UIO_H",
@@ -53012,6 +53672,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUCONFIG_ONLY_HTML_CONVERSION=1",
         "-DUCONFIG_USE_ML_PHRASE_BREAKING=1",
         "-DUCONFIG_USE_WINDOWS_LCID_MAPPING_API=0",
@@ -53025,7 +53686,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -53335,8 +53996,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_DLOPEN=0",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -53357,7 +54018,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -53388,6 +54049,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -53397,6 +54059,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -53407,6 +54070,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -53416,6 +54080,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -53425,6 +54090,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -53659,8 +54325,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_DLOPEN=0",
         "-DHAVE_SYS_UIO_H",
@@ -53669,6 +54335,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUCONFIG_ONLY_HTML_CONVERSION=1",
         "-DUCONFIG_USE_ML_PHRASE_BREAKING=1",
         "-DUCONFIG_USE_WINDOWS_LCID_MAPPING_API=0",
@@ -53683,7 +54350,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-Oz",
         "-fdata-sections",
@@ -53950,8 +54617,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_DLOPEN=0",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -53973,7 +54640,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-fdata-sections",
         "-ffunction-sections",
@@ -54004,6 +54671,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -54013,6 +54681,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-mno-outline",
@@ -54023,6 +54692,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -54032,6 +54702,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-msse3",
             ],
@@ -54041,6 +54712,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
                 "-msse3",
@@ -54116,19 +54788,185 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
+// GN: //third_party/jni_zero:jni_zero_utils
+cc_library_static {
+    name: "cronet_aml_third_party_jni_zero_jni_zero_utils",
+    srcs: [
+        "third_party/jni_zero/logging.cc",
+    ],
+    shared_libs: [
+        "liblog",
+    ],
+    defaults: [
+        "cronet_aml_defaults",
+    ],
+    cflags: [
+        "-DANDROID",
+        "-DANDROID_NDK_VERSION_ROLL=r25c_1",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
+        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+        "-DHAVE_SYS_UIO_H",
+        "-DNDEBUG",
+        "-DNO_UNWIND_TABLES",
+        "-DNVALGRIND",
+        "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-D_GNU_SOURCE",
+        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
+        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D__STDC_CONSTANT_MACROS",
+        "-D__STDC_FORMAT_MACROS",
+        "-Oz",
+        "-fdata-sections",
+        "-ffunction-sections",
+        "-fno-asynchronous-unwind-tables",
+        "-fno-unwind-tables",
+        "-fvisibility-inlines-hidden",
+        "-fvisibility=hidden",
+        "-g1",
+    ],
+    local_include_dirs: [
+        "./",
+        "buildtools/third_party/libc++/",
+        "third_party/libc++/src/include",
+        "third_party/libc++abi/src/include",
+    ],
+    cpp_std: "c++20",
+    ldflags: [
+        "-Wl,--as-needed",
+        "-Wl,--gc-sections",
+        "-Wl,--icf=all",
+    ],
+    target: {
+        android_arm: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+            ],
+        },
+        android_arm64: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+                "-mno-outline",
+            ],
+        },
+        android_riscv64: {
+            cflags: [
+                "-fstack-protector",
+            ],
+        },
+        android_x86: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-msse3",
+            ],
+        },
+        android_x86_64: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+                "-msse3",
+            ],
+        },
+    },
+}
+
+// GN: //third_party/jni_zero:jni_zero_utils__testing
+cc_library_static {
+    name: "cronet_aml_third_party_jni_zero_jni_zero_utils__testing",
+    srcs: [
+        "third_party/jni_zero/logging.cc",
+    ],
+    shared_libs: [
+        "liblog",
+    ],
+    defaults: [
+        "cronet_aml_defaults",
+    ],
+    cflags: [
+        "-DANDROID",
+        "-DANDROID_NDK_VERSION_ROLL=r25c_1",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
+        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+        "-DHAVE_SYS_UIO_H",
+        "-DNDEBUG",
+        "-DNO_UNWIND_TABLES",
+        "-DNVALGRIND",
+        "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-D_GNU_SOURCE",
+        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
+        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D__STDC_CONSTANT_MACROS",
+        "-D__STDC_FORMAT_MACROS",
+        "-Oz",
+        "-fdata-sections",
+        "-ffunction-sections",
+        "-fno-asynchronous-unwind-tables",
+        "-fno-unwind-tables",
+        "-fvisibility-inlines-hidden",
+        "-fvisibility=hidden",
+        "-g1",
+    ],
+    local_include_dirs: [
+        "./",
+        "buildtools/third_party/libc++/",
+        "third_party/libc++/src/include",
+        "third_party/libc++abi/src/include",
+    ],
+    cpp_std: "c++20",
+    ldflags: [
+        "-Wl,--as-needed",
+        "-Wl,--gc-sections",
+        "-Wl,--icf=all",
+    ],
+    target: {
+        android_arm: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+            ],
+        },
+        android_arm64: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+                "-mno-outline",
+            ],
+        },
+        android_riscv64: {
+            cflags: [
+                "-fstack-protector",
+            ],
+        },
+        android_x86: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-msse3",
+            ],
+        },
+        android_x86_64: {
+            cflags: [
+                "-D_FORTIFY_SOURCE=2",
+                "-fstack-protector",
+                "-msse3",
+            ],
+        },
+    },
+}
+
 // GN: //third_party/libevent:libevent
 cc_library_static {
     name: "cronet_aml_third_party_libevent_libevent",
     srcs: [
-        "third_party/libevent/buffer.c",
         "third_party/libevent/epoll.c",
-        "third_party/libevent/evbuffer.c",
-        "third_party/libevent/evdns.c",
         "third_party/libevent/event.c",
-        "third_party/libevent/event_tagging.c",
-        "third_party/libevent/evrpc.c",
         "third_party/libevent/evutil.c",
-        "third_party/libevent/http.c",
         "third_party/libevent/log.c",
         "third_party/libevent/poll.c",
         "third_party/libevent/select.c",
@@ -54141,8 +54979,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_CONFIG_H",
         "-DHAVE_SYS_UIO_H",
@@ -54150,9 +54988,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -54212,15 +55051,9 @@
 cc_library_static {
     name: "cronet_aml_third_party_libevent_libevent__testing",
     srcs: [
-        "third_party/libevent/buffer.c",
         "third_party/libevent/epoll.c",
-        "third_party/libevent/evbuffer.c",
-        "third_party/libevent/evdns.c",
         "third_party/libevent/event.c",
-        "third_party/libevent/event_tagging.c",
-        "third_party/libevent/evrpc.c",
         "third_party/libevent/evutil.c",
-        "third_party/libevent/http.c",
         "third_party/libevent/log.c",
         "third_party/libevent/poll.c",
         "third_party/libevent/select.c",
@@ -54232,8 +55065,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_CONFIG_H",
         "-DNDEBUG",
@@ -54242,7 +55075,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -54272,6 +55105,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
             local_include_dirs: [
@@ -54283,6 +55117,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -54295,6 +55130,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
             local_include_dirs: [
@@ -54306,6 +55142,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
             local_include_dirs: [
@@ -54317,6 +55154,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -54386,8 +55224,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -54395,6 +55233,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -54403,7 +55242,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D_REENTRANT",
         "-Oz",
@@ -54478,8 +55317,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -54487,6 +55326,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -54495,7 +55335,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -54574,8 +55414,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
@@ -54583,6 +55423,7 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-DUSE_CHROMIUM_ICU=1",
         "-DU_ENABLE_DYLOAD=0",
         "-DU_ENABLE_RESOURCE_TRACING=0",
@@ -54591,7 +55432,7 @@
         "-DU_USING_ICU_NAMESPACE=0",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -54677,8 +55518,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -54689,9 +55530,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -54774,8 +55616,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -54786,9 +55628,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -55143,17 +55986,18 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -55224,8 +56068,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DNDEBUG",
         "-DNO_UNWIND_TABLES",
@@ -55233,7 +56077,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -55263,6 +56107,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -55273,6 +56118,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -55284,6 +56130,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-Oz",
                 "-fstack-protector",
             ],
@@ -55293,6 +56140,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-msse3",
@@ -55303,6 +56151,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-D_FORTIFY_SOURCE=2",
                 "-Oz",
                 "-fstack-protector",
@@ -55331,9 +56180,11 @@
 // GN: //third_party/netty4:netty_all_java__testing
 java_import {
     name: "cronet_aml_third_party_netty4_netty_all_java__testing",
-    defaults: [
-        "cronet_aml_defaults",
+    apex_available: [
+        "com.android.tethering",
     ],
+    min_sdk_version: "30",
+    sdk_version: "current",
     visibility: [
         "//external/cronet:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
@@ -55368,8 +56219,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_OPENSSL",
         "-DHAVE_SYS_UIO_H",
@@ -55377,9 +56228,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -55513,8 +56365,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -55534,7 +56386,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -55628,8 +56480,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -55649,7 +56501,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -55719,8 +56571,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -55732,7 +56584,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -55767,6 +56619,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -55775,6 +56628,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -55784,6 +56638,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -55792,6 +56647,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
         },
@@ -55800,6 +56656,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -55863,8 +56720,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -55876,7 +56733,7 @@
         "-DOFFICIAL_BUILD",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -55911,6 +56768,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -55919,6 +56777,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-mno-outline",
             ],
@@ -55928,6 +56787,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
             ],
         },
@@ -55936,6 +56796,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-msse3",
             ],
         },
@@ -55944,6 +56805,7 @@
                 "-DANDROID",
                 "-DANDROID_NDK_VERSION_ROLL=r25c_1",
                 "-DHAVE_SYS_UIO_H",
+                "-DTEMP_REBUILD_HACK",
                 "-fstack-protector",
                 "-msse3",
             ],
@@ -55987,8 +56849,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -56007,7 +56869,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -56057,8 +56919,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -56077,7 +56939,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -56204,8 +57066,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -56224,7 +57086,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -56351,8 +57213,8 @@
         "cronet_aml_defaults",
     ],
     cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DCR_SYSROOT_KEY=20230611T210420Z-2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -56371,7 +57233,7 @@
         "-D_LARGEFILE64_SOURCE",
         "-D_LARGEFILE_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-O2",
         "-fdata-sections",
@@ -56421,8 +57283,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -56433,9 +57295,10 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -56538,6 +57401,115 @@
     ],
 }
 
+// GN: //third_party/re2:re2__testing
+cc_library_static {
+    name: "cronet_aml_third_party_re2_re2__testing",
+    srcs: [
+        "third_party/re2/src/re2/bitmap256.cc",
+        "third_party/re2/src/re2/bitstate.cc",
+        "third_party/re2/src/re2/compile.cc",
+        "third_party/re2/src/re2/dfa.cc",
+        "third_party/re2/src/re2/filtered_re2.cc",
+        "third_party/re2/src/re2/mimics_pcre.cc",
+        "third_party/re2/src/re2/nfa.cc",
+        "third_party/re2/src/re2/onepass.cc",
+        "third_party/re2/src/re2/parse.cc",
+        "third_party/re2/src/re2/perl_groups.cc",
+        "third_party/re2/src/re2/prefilter.cc",
+        "third_party/re2/src/re2/prefilter_tree.cc",
+        "third_party/re2/src/re2/prog.cc",
+        "third_party/re2/src/re2/re2.cc",
+        "third_party/re2/src/re2/regexp.cc",
+        "third_party/re2/src/re2/set.cc",
+        "third_party/re2/src/re2/simplify.cc",
+        "third_party/re2/src/re2/tostring.cc",
+        "third_party/re2/src/re2/unicode_casefold.cc",
+        "third_party/re2/src/re2/unicode_groups.cc",
+        "third_party/re2/src/util/rune.cc",
+        "third_party/re2/src/util/strutil.cc",
+    ],
+    shared_libs: [
+        "liblog",
+    ],
+    generated_headers: [
+        "cronet_aml_build_chromeos_buildflags__testing",
+    ],
+    export_generated_headers: [
+        "cronet_aml_build_chromeos_buildflags__testing",
+    ],
+    defaults: [
+        "cronet_aml_defaults",
+    ],
+    cflags: [
+        "-DANDROID",
+        "-DANDROID_NDK_VERSION_ROLL=r25c_1",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
+        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+        "-DHAVE_SYS_UIO_H",
+        "-DNDEBUG",
+        "-DNO_UNWIND_TABLES",
+        "-DNVALGRIND",
+        "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-D_GNU_SOURCE",
+        "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
+        "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+        "-Oz",
+        "-fdata-sections",
+        "-ffunction-sections",
+        "-fno-asynchronous-unwind-tables",
+        "-fno-unwind-tables",
+        "-fvisibility-inlines-hidden",
+        "-fvisibility=hidden",
+        "-g1",
+    ],
+    local_include_dirs: [
+        "./",
+        "buildtools/third_party/libc++/",
+        "third_party/abseil-cpp/",
+        "third_party/libc++/src/include",
+        "third_party/libc++abi/src/include",
+        "third_party/re2/src/",
+    ],
+    cpp_std: "c++20",
+    ldflags: [
+        "-Wl,--as-needed",
+        "-Wl,--gc-sections",
+        "-Wl,--icf=all",
+    ],
+    target: {
+        android_arm: {
+            cflags: [
+                "-fstack-protector",
+            ],
+        },
+        android_arm64: {
+            cflags: [
+                "-fstack-protector",
+                "-mno-outline",
+            ],
+        },
+        android_riscv64: {
+            cflags: [
+                "-fstack-protector",
+            ],
+        },
+        android_x86: {
+            cflags: [
+                "-msse3",
+            ],
+        },
+        android_x86_64: {
+            cflags: [
+                "-fstack-protector",
+                "-msse3",
+            ],
+        },
+    },
+}
+
 // GN: //url:buildflags
 cc_genrule {
     name: "cronet_aml_url_buildflags",
@@ -56614,6 +57586,7 @@
     ],
     shared_libs: [
         "//external/cronet/third_party/boringssl:libcrypto",
+        "//external/cronet/third_party/boringssl:libpki",
         "//external/cronet/third_party/boringssl:libssl",
         "libandroid",
         "liblog",
@@ -56626,21 +57599,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -56653,7 +57627,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags",
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags",
@@ -56663,21 +57637,22 @@
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags",
         "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_raw_ptr_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
-        "cronet_aml_base_android_runtime_jni_headers",
-        "cronet_aml_base_android_runtime_unchecked_jni_headers",
-        "cronet_aml_base_base_jni",
-        "cronet_aml_base_base_shared_preferences_jni",
+        "cronet_aml_base_android_runtime_jni_headers__action",
+        "cronet_aml_base_android_runtime_unchecked_jni_headers__action",
+        "cronet_aml_base_base_jni__action",
+        "cronet_aml_base_base_shared_preferences_jni__action",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
         "cronet_aml_base_clang_profiling_buildflags",
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_feature_list_buildflags",
+        "cronet_aml_base_fuzzing_buildflags",
         "cronet_aml_base_ios_cronet_buildflags",
         "cronet_aml_base_logging_buildflags",
         "cronet_aml_base_message_pump_buildflags",
         "cronet_aml_base_orderfile_buildflags",
         "cronet_aml_base_power_monitor_buildflags",
-        "cronet_aml_base_process_launcher_jni",
+        "cronet_aml_base_process_launcher_jni__action",
         "cronet_aml_base_profiler_buildflags",
         "cronet_aml_base_rust_buildflags",
         "cronet_aml_base_sanitizer_buildflags",
@@ -56690,7 +57665,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags",
         "cronet_aml_build_robolectric_buildflags",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_jni_headers",
+        "cronet_aml_url_url_jni_headers__action",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -56698,8 +57673,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_URL_IMPL",
@@ -56707,9 +57682,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -56833,6 +57810,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -56850,7 +57828,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     export_generated_headers: [
         "cronet_aml_base_allocator_buildflags__testing",
@@ -56865,6 +57843,7 @@
         "cronet_aml_base_clang_profiling_buildflags__testing",
         "cronet_aml_base_debugging_buildflags__testing",
         "cronet_aml_base_feature_list_buildflags__testing",
+        "cronet_aml_base_fuzzing_buildflags__testing",
         "cronet_aml_base_ios_cronet_buildflags__testing",
         "cronet_aml_base_logging_buildflags__testing",
         "cronet_aml_base_message_pump_buildflags__testing",
@@ -56882,7 +57861,7 @@
         "cronet_aml_build_config_compiler_compiler_buildflags__testing",
         "cronet_aml_build_robolectric_buildflags__testing",
         "cronet_aml_url_buildflags__testing",
-        "cronet_aml_url_url_jni_headers__testing",
+        "cronet_aml_url_url_jni_headers__action__testing",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -56890,8 +57869,8 @@
     cflags: [
         "-DANDROID",
         "-DANDROID_NDK_VERSION_ROLL=r25c_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"",
-        "-DCR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899",
+        "-DCR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"",
+        "-DCR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
         "-DHAVE_SYS_UIO_H",
         "-DIS_URL_IMPL",
@@ -56899,9 +57878,11 @@
         "-DNO_UNWIND_TABLES",
         "-DNVALGRIND",
         "-DOFFICIAL_BUILD",
+        "-DTEMP_REBUILD_HACK",
+        "-DUSE_CHROMIUM_BASE",
         "-D_GNU_SOURCE",
         "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "-D_LIBCPP_ENABLE_SAFE_MODE=1",
+        "-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
         "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -56984,7 +57965,7 @@
 java_library {
     name: "cronet_aml_url_url_java",
     srcs: [
-        ":cronet_aml_url_url_jni_headers__java",
+        ":cronet_aml_url_url_jni_headers__action__java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     static_libs: [
@@ -57002,7 +57983,7 @@
 java_library {
     name: "cronet_aml_url_url_java__testing",
     srcs: [
-        ":cronet_aml_url_url_jni_headers__testing__java",
+        ":cronet_aml_url_url_jni_headers__action__testing__java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     static_libs: [
@@ -57016,9 +57997,9 @@
     jarjar_rules: "android/tools/remove-gen-jni-jarjar-rules.txt",
 }
 
-// GN: //url:url_jni_headers
+// GN: //url:url_jni_headers__action
 cc_genrule {
-    name: "cronet_aml_url_url_jni_headers",
+    name: "cronet_aml_url_url_jni_headers__action",
     srcs: [
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
@@ -57058,9 +58039,9 @@
     ],
 }
 
-// GN: //url:url_jni_headers
+// GN: //url:url_jni_headers__action
 java_genrule {
-    name: "cronet_aml_url_url_jni_headers__java",
+    name: "cronet_aml_url_url_jni_headers__action__java",
     srcs: [
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
@@ -57097,9 +58078,9 @@
     ],
 }
 
-// GN: //url:url_jni_headers__testing
+// GN: //url:url_jni_headers__action__testing
 cc_genrule {
-    name: "cronet_aml_url_url_jni_headers__testing",
+    name: "cronet_aml_url_url_jni_headers__action__testing",
     srcs: [
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
@@ -57137,9 +58118,9 @@
     ],
 }
 
-// GN: //url:url_jni_headers__testing
+// GN: //url:url_jni_headers__action__testing
 java_genrule {
-    name: "cronet_aml_url_url_jni_headers__testing__java",
+    name: "cronet_aml_url_url_jni_headers__action__testing__java",
     srcs: [
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
diff --git a/android/tools/gn2bp/desc_arm.json b/android/tools/gn2bp/desc_arm.json
index 16134b6..a3dfbfa 100644
--- a/android/tools/gn2bp/desc_arm.json
+++ b/android/tools/gn2bp/desc_arm.json
@@ -49,20 +49,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wc++11-narrowing", "-Wconditional-uninitialized", "-Wcstring-format-directive", "-Wctad-maybe-unsupported", "-Wdeprecated-copy", "-Wdeprecated-copy-dtor", "-Wduplicate-enum", "-Wextra-semi", "-Wextra-semi-stmt", "-Wimplicit-fallthrough", "-Winconsistent-missing-destructor-override", "-Winvalid-offsetof", "-Wmissing-field-initializers", "-Wnon-c-typedef-for-linkage", "-Wpessimizing-move", "-Wrange-loop-analysis", "-Wredundant-move", "-Wshadow-field", "-Wstrict-prototypes", "-Wsuggest-destructor-override", "-Wsuggest-override", "-Wtautological-unsigned-zero-compare", "-Wunreachable-code-aggressive", "-Wunused-but-set-variable", "-Wunused-macros", "-pedantic", "-Wno-import-preprocessor-directive-pedantic", "-Wno-embedded-directive", "-Wno-gnu-statement-expression-from-macro-expansion", "-Wno-language-extension-token", "-Wno-zero-length-array" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_base_implementation", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_BASE_IMPL" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_base_implementation", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:dependants_extra_warnings", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_BASE_IMPL" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:chromecast_buildflags", "//base/allocator/partition_allocator/src/partition_alloc:chromeos_buildflags", "//base/allocator/partition_allocator/src/partition_alloc:debugging_buildflags", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_buildflags" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -71,7 +71,7 @@
       "public": "*",
       "public_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
-      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/atomic_ref_count.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/augmentations/compiler_specific.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/bit_cast.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/bits.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/check.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/check.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/component_export.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cpu.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cpu.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cxx20_is_constant_evaluated.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/alias.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/alias.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/export_template.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/gtest_prod_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/immediate_crash.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/page_size.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/ref_counted.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/ref_counted.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/scoped_policy.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/scoped_refptr.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/no_destructor.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/notreached.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/checked_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/checked_math_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/clamped_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/clamped_math_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions_arm_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_arm_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_clang_gcc_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_shared_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/eintr_wrapper.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/process/process_handle.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/scoped_clear_last_error.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/cstring_builder.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/cstring_builder.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/string_util.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/string_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/stringprintf.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/stringprintf.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/system/sys_info.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/thread_annotations.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_ref.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_override.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_override.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/types/strong_alias.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/win_handle_types.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/win_handle_types_list.inc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/windows_types.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_util_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/page_size_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/safe_strerror.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/safe_strerror.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/process/process_handle_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_conversion_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_android.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_now_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_android.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_path.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_path.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/native_library.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/native_library.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/native_library_posix.cc" ],
+      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/atomic_ref_count.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/augmentations/compiler_specific.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/bits.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/check.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/check.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/component_export.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cpu.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cpu.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cxx20_is_constant_evaluated.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/alias.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/alias.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/export_template.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/immediate_crash.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/page_size.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/ref_counted.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/ref_counted.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/scoped_policy.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/scoped_refptr.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/no_destructor.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/notreached.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/checked_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/checked_math_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/clamped_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/clamped_math_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions_arm_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_arm_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_clang_gcc_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_shared_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/eintr_wrapper.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/process/process_handle.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/scoped_clear_last_error.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/cstring_builder.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/cstring_builder.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/string_util.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/string_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/stringprintf.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/stringprintf.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/system/sys_info.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/thread_annotations.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_ref.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_override.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_override.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/types/strong_alias.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/win_handle_types.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/win_handle_types_list.inc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/windows_types.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_util_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/page_size_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/safe_strerror.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/safe_strerror.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/process/process_handle_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_conversion_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_android.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_now_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_android.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_path.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_path.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/native_library.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/native_library.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/native_library_posix.cc" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -82,20 +82,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wc++11-narrowing", "-Wconditional-uninitialized", "-Wcstring-format-directive", "-Wctad-maybe-unsupported", "-Wdeprecated-copy", "-Wdeprecated-copy-dtor", "-Wduplicate-enum", "-Wextra-semi", "-Wextra-semi-stmt", "-Wimplicit-fallthrough", "-Winconsistent-missing-destructor-override", "-Winvalid-offsetof", "-Wmissing-field-initializers", "-Wnon-c-typedef-for-linkage", "-Wpessimizing-move", "-Wrange-loop-analysis", "-Wredundant-move", "-Wshadow-field", "-Wstrict-prototypes", "-Wsuggest-destructor-override", "-Wsuggest-override", "-Wtautological-unsigned-zero-compare", "-Wunreachable-code-aggressive", "-Wunused-but-set-variable", "-Wunused-macros", "-pedantic", "-Wno-import-preprocessor-directive-pedantic", "-Wno-embedded-directive", "-Wno-gnu-statement-expression-from-macro-expansion", "-Wno-language-extension-token", "-Wno-zero-length-array" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_base_implementation", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_BASE_IMPL" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_base_implementation", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:dependants_extra_warnings", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
+      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_BASE_IMPL" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:chromecast_buildflags(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:chromeos_buildflags(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:debugging_buildflags(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_buildflags(//build/toolchain/linux:clang_x64)" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/clang_x64/gen/base/allocator/partition_allocator/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
       "metadata": {
 
       },
@@ -103,7 +103,7 @@
       "public": "*",
       "public_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=x86_64-unknown-linux-gnu", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
-      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/atomic_ref_count.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/augmentations/compiler_specific.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/bit_cast.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/bits.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/check.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/check.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/component_export.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cpu.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cpu.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cxx20_is_constant_evaluated.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/alias.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/alias.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/export_template.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/gtest_prod_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/immediate_crash.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/page_size.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/ref_counted.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/ref_counted.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/scoped_policy.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/scoped_refptr.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/no_destructor.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/notreached.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/checked_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/checked_math_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/clamped_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/clamped_math_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions_arm_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_arm_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_clang_gcc_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_shared_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/eintr_wrapper.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/process/process_handle.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/scoped_clear_last_error.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/cstring_builder.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/cstring_builder.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/string_util.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/string_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/stringprintf.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/stringprintf.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/system/sys_info.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/thread_annotations.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_ref.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_override.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_override.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/types/strong_alias.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/win_handle_types.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/win_handle_types_list.inc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/windows_types.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_util_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/page_size_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/safe_strerror.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/safe_strerror.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/process/process_handle_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_conversion_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_linux.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_now_posix.cc" ],
+      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/atomic_ref_count.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/augmentations/compiler_specific.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/bits.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/check.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/check.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/component_export.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cpu.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cpu.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/cxx20_is_constant_evaluated.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/alias.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/alias.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/export_template.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/immediate_crash.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/page_size.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/ref_counted.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/ref_counted.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/scoped_policy.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/scoped_refptr.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/no_destructor.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/notreached.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/checked_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/checked_math_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/clamped_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/clamped_math_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions_arm_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_conversions_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_arm_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_clang_gcc_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/numerics/safe_math_shared_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/eintr_wrapper.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/process/process_handle.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/scoped_clear_last_error.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/cstring_builder.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/cstring_builder.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/string_util.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/string_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/stringprintf.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/stringprintf.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/system/sys_info.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/thread_annotations.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_ref.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_override.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_override.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/types/strong_alias.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/win_handle_types.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/win_handle_types_list.inc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/win/windows_types.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_util.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/files/file_util_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/page_size_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/safe_strerror.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/safe_strerror.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/process/process_handle_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_conversion_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_linux.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_now_posix.cc" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/linux:clang_x64",
@@ -114,61 +114,63 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wc++11-narrowing", "-Wconditional-uninitialized", "-Wcstring-format-directive", "-Wctad-maybe-unsupported", "-Wdeprecated-copy", "-Wdeprecated-copy-dtor", "-Wduplicate-enum", "-Wextra-semi", "-Wextra-semi-stmt", "-Wimplicit-fallthrough", "-Winconsistent-missing-destructor-override", "-Winvalid-offsetof", "-Wmissing-field-initializers", "-Wnon-c-typedef-for-linkage", "-Wpessimizing-move", "-Wrange-loop-analysis", "-Wredundant-move", "-Wshadow-field", "-Wstrict-prototypes", "-Wsuggest-destructor-override", "-Wsuggest-override", "-Wtautological-unsigned-zero-compare", "-Wunreachable-code-aggressive", "-Wunused-but-set-variable", "-Wunused-macros", "-pedantic", "-Wno-import-preprocessor-directive-pedantic", "-Wno-embedded-directive", "-Wno-gnu-statement-expression-from-macro-expansion", "-Wno-language-extension-token", "-Wno-zero-length-array" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_implementation", "//base/allocator/partition_allocator/src/partition_alloc:memory_tagging", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/cpu_features:ndk_compat_headers" ],
-      "defines": [ "HAS_PR_MTE_MACROS", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_IMPL" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_implementation", "//base/allocator/partition_allocator/src/partition_alloc:memory_tagging", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:dependants_extra_warnings", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/cpu_features:ndk_compat_headers" ],
+      "defines": [ "HAS_PR_MTE_MACROS", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_IMPL" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:allocator_base", "//base/allocator/partition_allocator/src/partition_alloc:chromecast_buildflags", "//base/allocator/partition_allocator/src/partition_alloc:chromeos_buildflags", "//base/allocator/partition_allocator/src/partition_alloc:debugging_buildflags", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_buildflags", "//third_party/cpu_features:ndk_compat" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/cpu_features/src/ndk_compat/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
       "libs": [ "android_support" ],
       "metadata": {
 
       },
+      "outputs": [ "//out/cronet/obj/base/allocator/partition_allocator/src/partition_alloc/liballocator_core.a" ],
       "public": "*",
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
       "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager.cc", "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager.h", "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager_bitmap.cc", "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager_bitmap.h", "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager_types.h", "//base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.cc", "//base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h", "//base/allocator/partition_allocator/src/partition_alloc/address_space_stats.h", "//base/allocator/partition_allocator/src/partition_alloc/allocation_guard.cc", "//base/allocator/partition_allocator/src/partition_alloc/allocation_guard.h", "//base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.cc", "//base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.h", "//base/allocator/partition_allocator/src/partition_alloc/dangling_raw_ptr_checks.cc", "//base/allocator/partition_allocator/src/partition_alloc/dangling_raw_ptr_checks.h", "//base/allocator/partition_allocator/src/partition_alloc/flags.h", "//base/allocator/partition_allocator/src/partition_alloc/freeslot_bitmap.h", "//base/allocator/partition_allocator/src/partition_alloc/freeslot_bitmap_constants.h", "//base/allocator/partition_allocator/src/partition_alloc/gwp_asan_support.cc", "//base/allocator/partition_allocator/src/partition_alloc/gwp_asan_support.h", "//base/allocator/partition_allocator/src/partition_alloc/lightweight_quarantine.cc", "//base/allocator/partition_allocator/src/partition_alloc/lightweight_quarantine.h", "//base/allocator/partition_allocator/src/partition_alloc/memory_reclaimer.cc", "//base/allocator/partition_allocator/src/partition_alloc/memory_reclaimer.h", "//base/allocator/partition_allocator/src/partition_alloc/oom.cc", "//base/allocator/partition_allocator/src/partition_alloc/oom.h", "//base/allocator/partition_allocator/src/partition_alloc/oom_callback.cc", "//base/allocator/partition_allocator/src/partition_alloc/oom_callback.h", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator.cc", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator.h", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator_internal.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_address_space.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc-inl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_allocation_data.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_check.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_hooks.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_hooks.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_bucket.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_bucket_lookup.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_cookie.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_dcheck_helper.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_dcheck_helper.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_direct_map_extent.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_freelist_entry.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_freelist_entry.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_lock.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_oom.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_oom.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_page.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_page.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_ref_count.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_root.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_root.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_stats.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_stats.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_superpage_extent_entry.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_tls.h", "//base/allocator/partition_allocator/src/partition_alloc/random.cc", "//base/allocator/partition_allocator/src/partition_alloc/random.h", "//base/allocator/partition_allocator/src/partition_alloc/reservation_offset_table.cc", "//base/allocator/partition_allocator/src/partition_alloc/reservation_offset_table.h", "//base/allocator/partition_allocator/src/partition_alloc/reverse_bytes.h", "//base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc", "//base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.h", "//base/allocator/partition_allocator/src/partition_alloc/tagging.cc", "//base/allocator/partition_allocator/src/partition_alloc/tagging.h", "//base/allocator/partition_allocator/src/partition_alloc/thread_cache.cc", "//base/allocator/partition_allocator/src/partition_alloc/thread_cache.h", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/alignment.h", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.h", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/thread_isolation.cc", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/thread_isolation.h", "//base/allocator/partition_allocator/src/partition_alloc/yield_processor.h", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h", "//base/allocator/partition_allocator/src/partition_alloc/encoded_next_freelist.h" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "source_set",
+      "type": "static_library",
       "visibility": [ "//base/allocator/partition_allocator/src/partition_alloc:*" ]
    },
    "//base/allocator/partition_allocator/src/partition_alloc:allocator_core(//build/toolchain/linux:clang_x64)": {
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wc++11-narrowing", "-Wconditional-uninitialized", "-Wcstring-format-directive", "-Wctad-maybe-unsupported", "-Wdeprecated-copy", "-Wdeprecated-copy-dtor", "-Wduplicate-enum", "-Wextra-semi", "-Wextra-semi-stmt", "-Wimplicit-fallthrough", "-Winconsistent-missing-destructor-override", "-Winvalid-offsetof", "-Wmissing-field-initializers", "-Wnon-c-typedef-for-linkage", "-Wpessimizing-move", "-Wrange-loop-analysis", "-Wredundant-move", "-Wshadow-field", "-Wstrict-prototypes", "-Wsuggest-destructor-override", "-Wsuggest-override", "-Wtautological-unsigned-zero-compare", "-Wunreachable-code-aggressive", "-Wunused-but-set-variable", "-Wunused-macros", "-pedantic", "-Wno-import-preprocessor-directive-pedantic", "-Wno-embedded-directive", "-Wno-gnu-statement-expression-from-macro-expansion", "-Wno-language-extension-token", "-Wno-zero-length-array" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_implementation", "//base/allocator/partition_allocator/src/partition_alloc:memory_tagging", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_IMPL" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_implementation", "//base/allocator/partition_allocator/src/partition_alloc:memory_tagging", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:dependants_extra_warnings", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
+      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_IMPL" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:allocator_base(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:chromecast_buildflags(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:chromeos_buildflags(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:debugging_buildflags(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_buildflags(//build/toolchain/linux:clang_x64)" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/clang_x64/gen/base/allocator/partition_allocator/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
       "metadata": {
 
       },
+      "outputs": [ "//out/cronet/clang_x64/obj/base/allocator/partition_allocator/src/partition_alloc/liballocator_core.a" ],
       "public": "*",
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=x86_64-unknown-linux-gnu", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
       "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager.cc", "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager.h", "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager_bitmap.cc", "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager_bitmap.h", "//base/allocator/partition_allocator/src/partition_alloc/address_pool_manager_types.h", "//base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.cc", "//base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h", "//base/allocator/partition_allocator/src/partition_alloc/address_space_stats.h", "//base/allocator/partition_allocator/src/partition_alloc/allocation_guard.cc", "//base/allocator/partition_allocator/src/partition_alloc/allocation_guard.h", "//base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.cc", "//base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.h", "//base/allocator/partition_allocator/src/partition_alloc/dangling_raw_ptr_checks.cc", "//base/allocator/partition_allocator/src/partition_alloc/dangling_raw_ptr_checks.h", "//base/allocator/partition_allocator/src/partition_alloc/flags.h", "//base/allocator/partition_allocator/src/partition_alloc/freeslot_bitmap.h", "//base/allocator/partition_allocator/src/partition_alloc/freeslot_bitmap_constants.h", "//base/allocator/partition_allocator/src/partition_alloc/gwp_asan_support.cc", "//base/allocator/partition_allocator/src/partition_alloc/gwp_asan_support.h", "//base/allocator/partition_allocator/src/partition_alloc/lightweight_quarantine.cc", "//base/allocator/partition_allocator/src/partition_alloc/lightweight_quarantine.h", "//base/allocator/partition_allocator/src/partition_alloc/memory_reclaimer.cc", "//base/allocator/partition_allocator/src/partition_alloc/memory_reclaimer.h", "//base/allocator/partition_allocator/src/partition_alloc/oom.cc", "//base/allocator/partition_allocator/src/partition_alloc/oom.h", "//base/allocator/partition_allocator/src/partition_alloc/oom_callback.cc", "//base/allocator/partition_allocator/src/partition_alloc/oom_callback.h", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator.cc", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator.h", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator_internal.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_address_space.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc-inl.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_allocation_data.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_check.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_hooks.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_hooks.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_bucket.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_bucket_lookup.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_cookie.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_dcheck_helper.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_dcheck_helper.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_direct_map_extent.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_freelist_entry.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_freelist_entry.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_lock.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_oom.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_oom.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_page.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_page.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_ref_count.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_root.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_root.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_stats.cc", "//base/allocator/partition_allocator/src/partition_alloc/partition_stats.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_superpage_extent_entry.h", "//base/allocator/partition_allocator/src/partition_alloc/partition_tls.h", "//base/allocator/partition_allocator/src/partition_alloc/random.cc", "//base/allocator/partition_allocator/src/partition_alloc/random.h", "//base/allocator/partition_allocator/src/partition_alloc/reservation_offset_table.cc", "//base/allocator/partition_allocator/src/partition_alloc/reservation_offset_table.h", "//base/allocator/partition_allocator/src/partition_alloc/reverse_bytes.h", "//base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc", "//base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.h", "//base/allocator/partition_allocator/src/partition_alloc/tagging.cc", "//base/allocator/partition_allocator/src/partition_alloc/tagging.h", "//base/allocator/partition_allocator/src/partition_alloc/thread_cache.cc", "//base/allocator/partition_allocator/src/partition_alloc/thread_cache.h", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/alignment.h", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.h", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/thread_isolation.cc", "//base/allocator/partition_allocator/src/partition_alloc/thread_isolation/thread_isolation.h", "//base/allocator/partition_allocator/src/partition_alloc/yield_processor.h", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc", "//base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h", "//base/allocator/partition_allocator/src/partition_alloc/encoded_next_freelist.h" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/linux:clang_x64",
-      "type": "source_set",
+      "type": "static_library",
       "visibility": [ "//base/allocator/partition_allocator/src/partition_alloc:*" ]
    },
    "//base/allocator/partition_allocator/src/partition_alloc:allocator_shim": {
@@ -176,63 +178,65 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wc++11-narrowing", "-Wconditional-uninitialized", "-Wcstring-format-directive", "-Wctad-maybe-unsupported", "-Wdeprecated-copy", "-Wdeprecated-copy-dtor", "-Wduplicate-enum", "-Wextra-semi", "-Wextra-semi-stmt", "-Wimplicit-fallthrough", "-Winconsistent-missing-destructor-override", "-Winvalid-offsetof", "-Wmissing-field-initializers", "-Wnon-c-typedef-for-linkage", "-Wpessimizing-move", "-Wrange-loop-analysis", "-Wredundant-move", "-Wshadow-field", "-Wstrict-prototypes", "-Wsuggest-destructor-override", "-Wsuggest-override", "-Wtautological-unsigned-zero-compare", "-Wunreachable-code-aggressive", "-Wunused-but-set-variable", "-Wunused-macros", "-pedantic", "-Wno-import-preprocessor-directive-pedantic", "-Wno-embedded-directive", "-Wno-gnu-statement-expression-from-macro-expansion", "-Wno-language-extension-token", "-Wno-zero-length-array" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_implementation", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_IMPL" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:allocator_shim_implementation", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:dependants_extra_warnings", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_ALLOCATOR_SHIM_IMPL" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:allocator_base", "//base/allocator/partition_allocator/src/partition_alloc:allocator_core", "//base/allocator/partition_allocator/src/partition_alloc:buildflags" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support" ],
       "metadata": {
 
       },
+      "outputs": [ "//out/cronet/obj/base/allocator/partition_allocator/src/partition_alloc/liballocator_shim.a" ],
       "public": "*",
       "public_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
-      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.cc", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_internals.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_cpp_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_linker_wrapped_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc" ],
+      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_internals.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_cpp_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_linker_wrapped_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.cc", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "source_set",
+      "type": "static_library",
       "visibility": [ "//base/allocator/partition_allocator/src/partition_alloc:*" ]
    },
    "//base/allocator/partition_allocator/src/partition_alloc:allocator_shim(//build/toolchain/linux:clang_x64)": {
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wc++11-narrowing", "-Wconditional-uninitialized", "-Wcstring-format-directive", "-Wctad-maybe-unsupported", "-Wdeprecated-copy", "-Wdeprecated-copy-dtor", "-Wduplicate-enum", "-Wextra-semi", "-Wextra-semi-stmt", "-Wimplicit-fallthrough", "-Winconsistent-missing-destructor-override", "-Winvalid-offsetof", "-Wmissing-field-initializers", "-Wnon-c-typedef-for-linkage", "-Wpessimizing-move", "-Wrange-loop-analysis", "-Wredundant-move", "-Wshadow-field", "-Wstrict-prototypes", "-Wsuggest-destructor-override", "-Wsuggest-override", "-Wtautological-unsigned-zero-compare", "-Wunreachable-code-aggressive", "-Wunused-but-set-variable", "-Wunused-macros", "-pedantic", "-Wno-import-preprocessor-directive-pedantic", "-Wno-embedded-directive", "-Wno-gnu-statement-expression-from-macro-expansion", "-Wno-language-extension-token", "-Wno-zero-length-array" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_implementation", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_PARTITION_ALLOC_IMPL" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:allocator_shim_implementation", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:dependants_extra_warnings", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
+      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "IS_ALLOCATOR_SHIM_IMPL" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:allocator_base(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:allocator_core(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:buildflags(//build/toolchain/linux:clang_x64)" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/clang_x64/gen/base/allocator/partition_allocator/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
       "metadata": {
 
       },
+      "outputs": [ "//out/cronet/clang_x64/obj/base/allocator/partition_allocator/src/partition_alloc/liballocator_shim.a" ],
       "public": "*",
       "public_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=x86_64-unknown-linux-gnu", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
-      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.cc", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_internals.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_cpp_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_glibc_weak_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_libc_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_glibc.cc" ],
+      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_internals.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_cpp_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_glibc_weak_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_override_libc_symbols.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.cc", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_glibc.cc" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/linux:clang_x64",
-      "type": "source_set",
+      "type": "static_library",
       "visibility": [ "//base/allocator/partition_allocator/src/partition_alloc:*" ]
    },
    "//base/allocator/partition_allocator/src/partition_alloc:buildflags": {
@@ -354,64 +358,28 @@
    },
    "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc": {
       "all_dependent_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols" ],
-      "allow_circular_includes_from": [  ],
-      "arflags": [ "-T" ],
-      "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
-      "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
-      "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
-      "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:allocator_base", "//base/allocator/partition_allocator/src/partition_alloc:allocator_core", "//base/allocator/partition_allocator/src/partition_alloc:allocator_shim" ],
-      "externs": {
-
-      },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support" ],
       "metadata": {
 
       },
       "public": "*",
       "public_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Copt-level=z", "-Zdwarf-version=4", "-Cdebuginfo=1" ],
-      "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "source_set",
+      "type": "group",
       "visibility": [ "*" ]
    },
    "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc(//build/toolchain/linux:clang_x64)": {
-      "allow_circular_includes_from": [  ],
-      "arflags": [ "-T" ],
-      "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
-      "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
-      "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
-      "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:allocator_base(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:allocator_core(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator/src/partition_alloc:allocator_shim(//build/toolchain/linux:clang_x64)" ],
-      "externs": {
-
-      },
-      "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/clang_x64/gen/base/allocator/partition_allocator/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "metadata": {
 
       },
       "public": "*",
       "public_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=x86_64-unknown-linux-gnu", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Copt-level=3", "-Zdwarf-version=4", "-Cdebuginfo=1" ],
-      "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/linux:clang_x64",
-      "type": "source_set",
+      "type": "group",
       "visibility": [ "*" ]
    },
    "//base/allocator/partition_allocator/src/partition_alloc:partition_alloc_buildflags": {
@@ -449,63 +417,65 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wc++11-narrowing", "-Wconditional-uninitialized", "-Wcstring-format-directive", "-Wctad-maybe-unsupported", "-Wdeprecated-copy", "-Wdeprecated-copy-dtor", "-Wduplicate-enum", "-Wextra-semi", "-Wextra-semi-stmt", "-Wimplicit-fallthrough", "-Winconsistent-missing-destructor-override", "-Winvalid-offsetof", "-Wmissing-field-initializers", "-Wnon-c-typedef-for-linkage", "-Wpessimizing-move", "-Wrange-loop-analysis", "-Wredundant-move", "-Wshadow-field", "-Wstrict-prototypes", "-Wsuggest-destructor-override", "-Wsuggest-override", "-Wtautological-unsigned-zero-compare", "-Wunreachable-code-aggressive", "-Wunused-but-set-variable", "-Wunused-macros", "-pedantic", "-Wno-import-preprocessor-directive-pedantic", "-Wno-embedded-directive", "-Wno-gnu-statement-expression-from-macro-expansion", "-Wno-language-extension-token", "-Wno-zero-length-array" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": false,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "defines": [ "IS_RAW_PTR_IMPL", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:dependants_extra_warnings", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
+      "defines": [ "IS_RAW_PTR_IMPL", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:buildflags" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
       "libs": [ "android_support" ],
       "metadata": {
 
       },
+      "outputs": [ "//out/cronet/obj/base/allocator/partition_allocator/src/partition_alloc/libraw_ptr.a" ],
       "public": [ "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_cast.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_exclusion.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_noop_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ref.h" ],
       "public_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
-      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_noop_impl.h" ],
+      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_noop_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/empty.cc" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "source_set",
+      "type": "static_library",
       "visibility": [ "*" ]
    },
    "//base/allocator/partition_allocator/src/partition_alloc:raw_ptr(//build/toolchain/linux:clang_x64)": {
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wc++11-narrowing", "-Wconditional-uninitialized", "-Wcstring-format-directive", "-Wctad-maybe-unsupported", "-Wdeprecated-copy", "-Wdeprecated-copy-dtor", "-Wduplicate-enum", "-Wextra-semi", "-Wextra-semi-stmt", "-Wimplicit-fallthrough", "-Winconsistent-missing-destructor-override", "-Winvalid-offsetof", "-Wmissing-field-initializers", "-Wnon-c-typedef-for-linkage", "-Wpessimizing-move", "-Wrange-loop-analysis", "-Wredundant-move", "-Wshadow-field", "-Wstrict-prototypes", "-Wsuggest-destructor-override", "-Wsuggest-override", "-Wtautological-unsigned-zero-compare", "-Wunreachable-code-aggressive", "-Wunused-but-set-variable", "-Wunused-macros", "-pedantic", "-Wno-import-preprocessor-directive-pedantic", "-Wno-embedded-directive", "-Wno-gnu-statement-expression-from-macro-expansion", "-Wno-language-extension-token", "-Wno-zero-length-array" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": false,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
-      "defines": [ "IS_RAW_PTR_IMPL", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:dependants_extra_warnings", "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
+      "defines": [ "IS_RAW_PTR_IMPL", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base/allocator/partition_allocator/src/partition_alloc:buildflags(//build/toolchain/linux:clang_x64)" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/clang_x64/gen/base/allocator/partition_allocator/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
       "metadata": {
 
       },
+      "outputs": [ "//out/cronet/clang_x64/obj/base/allocator/partition_allocator/src/partition_alloc/libraw_ptr.a" ],
       "public": [ "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_cast.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_exclusion.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_noop_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ref.h" ],
       "public_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:public_includes" ],
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=x86_64-unknown-linux-gnu", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
-      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_noop_impl.h" ],
+      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_noop_impl.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/empty.cc" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/linux:clang_x64",
-      "type": "source_set",
+      "type": "static_library",
       "visibility": [ "*" ]
    },
    "//base/allocator/partition_allocator/src/partition_alloc:raw_ptr_buildflags": {
@@ -649,20 +619,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -680,20 +650,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
-      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
+      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "metadata": {
 
       },
@@ -707,6 +677,19 @@
       "visibility": [ "//base/*" ]
    },
    "//base/test:base_unittests_jni_headers": {
+      "deps": [ "//base/test:base_unittests_jni_headers__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": true,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base/test:base_unittests_jni_headers__action": {
       "args": [ "from-source", "--output-dir", "gen/jni_headers/base/test/base_unittests_jni_headers", "--extra-include", "../../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/base/test/base_unittests_jni_headers.srcjar", "--use-proxy-hash", "--output-name", "ContentUriTestUtils_jni.h", "--output-name", "JavaHandlerThreadHelpers_jni.h", "--input-file=../../base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java", "--input-file=../../base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java", "//base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -716,9 +699,9 @@
       },
       "outputs": [ "//out/cronet/gen/base/test/base_unittests_jni_headers.srcjar", "//out/cronet/gen/jni_headers/base/test/base_unittests_jni_headers/ContentUriTestUtils_jni.h", "//out/cronet/gen/jni_headers/base/test/base_unittests_jni_headers/JavaHandlerThreadHelpers_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
-      "testonly": true,
+      "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "action",
       "visibility": [ "*" ]
@@ -727,20 +710,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/sanitizers:link_shared_library" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
-      "deps": [ "//build/config:shared_library_deps" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/sanitizers:link_shared_library" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "deps": [ "//base:fuzzing_buildflags", "//build/config:shared_library_deps" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support", "dl", "m" ],
       "metadata": {
          "shared_libraries": [ "//out/cronet/libimmediate_crash_test_helper.so" ]
@@ -759,20 +742,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -791,20 +774,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/protobuf:protobuf_config" ],
-      "defines": [ "PROTO_TEST_IMPLEMENTATION", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/protobuf:protobuf_config" ],
+      "defines": [ "PROTO_TEST_IMPLEMENTATION", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
       "deps": [ "//base:base", "//third_party/protobuf:protobuf_full" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/protobuf/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -824,7 +807,8 @@
       "metadata": {
          "all_deps": [ "//base:base_java", "//base:base_java_test_support", "//build/android:build_java", "//third_party/android_deps:espresso_java", "//third_party/android_deps:guava_android_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_core_core_java", "//third_party/androidx:androidx_test_monitor_java", "//third_party/hamcrest:hamcrest_java", "//third_party/junit:junit" ],
          "jar_path": [ "" ],
-         "source_files": [ "//base/test/android/javatests/src/org/chromium/base/test/transit/CallbackCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Condition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionChecker.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionWaiter.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionalState.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Elements.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/InstrumentationThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/PublicTransitConfig.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/StationFacility.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitAsserts.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitStation.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Transition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TravelException.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Trip.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/UiThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ViewConditions.java" ],
+         "sdk_version": [ "current" ],
+         "source_files": [ "//base/test/android/javatests/src/org/chromium/base/test/transit/CallbackCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Condition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionChecker.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionWaiter.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionalState.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Elements.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/InstrumentationThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/PublicTransitConfig.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/StationFacility.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TrafficControl.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitAsserts.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitStation.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Transition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TravelException.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Trip.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/UiThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ViewConditions.java" ],
          "target_type": [ "java_library" ]
       },
       "public": "*",
@@ -864,7 +848,7 @@
       "args": [ "--depfile=gen/base/test/public_transit_java__compile_java.d", "--generated-dir=gen/base/test/public_transit_java/generated_java", "--jar-path=obj/base/test/public_transit_java.javac.jar", "--java-srcjars=[\"gen/base/test/public_transit_java.generated.srcjar\"]", "--target-name", "//base/test:public_transit_java__compile_java", "--classpath=@FileArg(gen/base/test/public_transit_java.build_config.json:android:sdk_interface_jars)", "--header-jar", "obj/base/test/public_transit_java.turbine.jar", "--classpath=[\"obj/base/test/public_transit_java.turbine.jar\"]", "--classpath=@FileArg(gen/base/test/public_transit_java.build_config.json:deps_info:javac_full_interface_classpath)", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/base/test/public_transit_java.sources" ],
       "depfile": "//out/cronet/gen/base/test/public_transit_java__compile_java.d",
       "deps": [ "//base:base_java__header", "//base:base_java_test_support__header", "//base/test:public_transit_java__build_config_crbug_908819", "//base/test:public_transit_java__header", "//build/android:build_java__header", "//third_party/android_deps:espresso_java__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_core_core_java__header", "//third_party/androidx:androidx_test_monitor_java__header", "//third_party/hamcrest:hamcrest_java__header", "//third_party/junit:junit__header" ],
-      "inputs": [ "//base/test/android/javatests/src/org/chromium/base/test/transit/CallbackCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Condition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionChecker.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionWaiter.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionalState.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Elements.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/InstrumentationThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/PublicTransitConfig.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/StationFacility.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitAsserts.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitStation.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Transition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TravelException.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Trip.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/UiThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ViewConditions.java", "//out/cronet/gen/base/test/public_transit_java.generated.srcjar", "//out/cronet/gen/base/test/public_transit_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/test/public_transit_java.sources", "//out/cronet/obj/base/test/public_transit_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "inputs": [ "//base/test/android/javatests/src/org/chromium/base/test/transit/CallbackCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Condition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionChecker.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionWaiter.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionalState.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Elements.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/InstrumentationThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/PublicTransitConfig.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/StationFacility.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TrafficControl.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitAsserts.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitStation.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Transition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TravelException.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Trip.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/UiThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ViewConditions.java", "//out/cronet/gen/base/test/public_transit_java.generated.srcjar", "//out/cronet/gen/base/test/public_transit_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/test/public_transit_java.sources", "//out/cronet/obj/base/test/public_transit_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
       "metadata": {
 
       },
@@ -896,7 +880,7 @@
       "args": [ "--depfile=gen/base/test/public_transit_java__header.d", "--generated-dir=gen/base/test/public_transit_java/generated_java", "--jar-path=obj/base/test/public_transit_java.turbine.jar", "--java-srcjars=[]", "--target-name", "//base/test:public_transit_java__header", "--classpath=@FileArg(gen/base/test/public_transit_java.build_config.json:android:sdk_interface_jars)", "--classpath=@FileArg(gen/base/test/public_transit_java.build_config.json:javac:interface_classpath)", "--processorpath=@FileArg(gen/base/test/public_transit_java.build_config.json:javac:processor_classpath)", "--processors=@FileArg(gen/base/test/public_transit_java.build_config.json:javac:processor_classes)", "--turbine-jar-path", "../../third_party/turbine/turbine.jar", "--generated-jar-path", "gen/base/test/public_transit_java.generated.srcjar", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/base/test/public_transit_java.sources" ],
       "depfile": "//out/cronet/gen/base/test/public_transit_java__header.d",
       "deps": [ "//base:base_java__header", "//base:base_java_test_support__header", "//base/test:public_transit_java__build_config_crbug_908819", "//build/android:build_java__header", "//third_party/android_deps:espresso_java__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_core_core_java__header", "//third_party/androidx:androidx_test_monitor_java__header", "//third_party/hamcrest:hamcrest_java__header", "//third_party/junit:junit__header" ],
-      "inputs": [ "//base/test/android/javatests/src/org/chromium/base/test/transit/CallbackCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Condition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionChecker.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionWaiter.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionalState.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Elements.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/InstrumentationThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/PublicTransitConfig.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/StationFacility.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitAsserts.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitStation.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Transition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TravelException.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Trip.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/UiThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ViewConditions.java", "//out/cronet/gen/base/test/public_transit_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/test/public_transit_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "inputs": [ "//base/test/android/javatests/src/org/chromium/base/test/transit/CallbackCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Condition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionChecker.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionWaiter.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ConditionalState.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Elements.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/InstrumentationThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/PublicTransitConfig.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/StationFacility.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TrafficControl.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitAsserts.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TransitStation.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Transition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/TravelException.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/Trip.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/UiThreadCondition.java", "//base/test/android/javatests/src/org/chromium/base/test/transit/ViewConditions.java", "//out/cronet/gen/base/test/public_transit_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/test/public_transit_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
       "metadata": {
 
       },
@@ -954,20 +938,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
       "deps": [ "//base/test:test_support" ],
       "externs": {
 
       },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/re2/src/" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -986,20 +970,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:executable_config", "//build/config/sanitizers:link_executable" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:export_dynamic", "//build/config:default_libs", "//build/config:executable_config", "//build/config/sanitizers:link_executable" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//build/config:executable_deps" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc" ],
       "libs": [ "android_support", "dl", "m" ],
       "metadata": {
 
@@ -1019,20 +1003,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base:base", "//base:clang_profiling_buildflags", "//build:chromeos_buildflags" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -1051,20 +1035,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/sanitizers:not_fuzzed", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/sanitizers:not_fuzzed", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
       "deps": [ "//base/test:test_proto_gen", "//third_party/protobuf:protobuf_lite" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/protobuf/src/", "//out/cronet/gen/protoc_out/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support", "log" ],
       "metadata": {
 
@@ -1129,20 +1113,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/android:hide_all_but_jni_onload", "//build/config/sanitizers:link_shared_library" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/android:hide_all_but_jni_onload", "//build/config/sanitizers:link_shared_library" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base/test:native_library_test_utils", "//build/config:shared_library_deps" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../build/android/android_only_explicit_jni_exports.lst" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../build/android/android_only_explicit_jni_exports.lst" ],
       "libs": [ "android_support", "dl", "m" ],
       "metadata": {
          "shared_libraries": [ "//out/cronet/libtest_shared_library.so" ]
@@ -1162,27 +1146,27 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override", "-DLIBXML_STATIC=" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override", "-DLIBXML_STATIC=" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:precompiled_headers", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config", "//third_party/libxml:libxml_config", "//third_party/jni_zero:jni_include_dir" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:precompiled_headers", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config", "//third_party/libxml:libxml_config", "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST", "USE_CHROMIUM_BASE" ],
       "deps": [ "//base:base", "//base:base_static", "//base:i18n", "//base/test:base_unittests_jni_headers", "//base/test:test_config", "//base/test:test_support_java", "//base/test:test_support_jni_headers", "//base/third_party/dynamic_annotations:dynamic_annotations", "//build:blink_buildflags", "//build:chromeos_buildflags", "//testing/gmock:gmock", "//testing/gtest:gtest", "//third_party/google_benchmark:google_benchmark", "//third_party/icu:icuuc", "//third_party/libxml:libxml_utils", "//third_party/libxml:xml_reader" ],
       "externs": {
 
       },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/libxml/src/include/", "//third_party/libxml/linux/include/", "//out/cronet/gen/jni_headers/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/re2/src/", "//third_party/libxml/src/include/", "//third_party/libxml/linux/include/", "//out/cronet/gen/jni_headers/" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
       },
       "outputs": [ "//out/cronet/obj/base/test/libtest_support.a" ],
       "public": "*",
-      "public_configs": [ "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config" ],
+      "public_configs": [ "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config" ],
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Copt-level=z", "-Zdwarf-version=4", "-Cdebuginfo=1" ],
       "sources": [ "//base/task/sequence_manager/test/fake_task.cc", "//base/task/sequence_manager/test/fake_task.h", "//base/task/sequence_manager/test/mock_time_domain.cc", "//base/task/sequence_manager/test/mock_time_domain.h", "//base/task/sequence_manager/test/mock_time_message_pump.cc", "//base/task/sequence_manager/test/mock_time_message_pump.h", "//base/task/sequence_manager/test/sequence_manager_for_test.cc", "//base/task/sequence_manager/test/sequence_manager_for_test.h", "//base/task/sequence_manager/test/test_task_time_observer.h", "//base/timer/mock_timer.cc", "//base/timer/mock_timer.h", "//base/test/allow_check_is_test_for_testing.h", "//base/test/bind.cc", "//base/test/bind.h", "//base/test/copy_only_int.cc", "//base/test/copy_only_int.h", "//base/test/gmock_callback_support.h", "//base/test/gmock_expected_support.h", "//base/test/gmock_move_support.h", "//base/test/gtest_links.cc", "//base/test/gtest_links.h", "//base/test/gtest_tags.cc", "//base/test/gtest_tags.h", "//base/test/gtest_util.cc", "//base/test/gtest_util.h", "//base/test/gtest_xml_unittest_result_printer.cc", "//base/test/gtest_xml_unittest_result_printer.h", "//base/test/gtest_xml_util.cc", "//base/test/gtest_xml_util.h", "//base/test/icu_test_util.cc", "//base/test/icu_test_util.h", "//base/test/launcher/test_result.cc", "//base/test/launcher/test_result.h", "//base/test/launcher/test_results_tracker.h", "//base/test/launcher/unit_test_launcher.h", "//base/test/metrics/histogram_enum_reader.cc", "//base/test/metrics/histogram_enum_reader.h", "//base/test/metrics/histogram_tester.cc", "//base/test/metrics/histogram_tester.h", "//base/test/metrics/user_action_tester.cc", "//base/test/metrics/user_action_tester.h", "//base/test/mock_callback.h", "//base/test/mock_devices_changed_observer.cc", "//base/test/mock_devices_changed_observer.h", "//base/test/mock_entropy_provider.cc", "//base/test/mock_entropy_provider.h", "//base/test/mock_log.cc", "//base/test/mock_log.h", "//base/test/move_only_int.h", "//base/test/multiprocess_test.h", "//base/test/null_task_runner.cc", "//base/test/null_task_runner.h", "//base/test/perf_log.cc", "//base/test/perf_log.h", "//base/test/perf_test_suite.cc", "//base/test/perf_test_suite.h", "//base/test/perf_time_logger.cc", "//base/test/perf_time_logger.h", "//base/test/power_monitor_test.cc", "//base/test/power_monitor_test.h", "//base/test/power_monitor_test_utils.cc", "//base/test/power_monitor_test_utils.h", "//base/test/protobuf_matchers.h", "//base/test/rectify_callback.h", "//base/test/rectify_callback_internal.h", "//base/test/repeating_test_future.h", "//base/test/run_until.cc", "//base/test/run_until.h", "//base/test/scoped_amount_of_physical_memory_override.cc", "//base/test/scoped_amount_of_physical_memory_override.h", "//base/test/scoped_block_tests_writing_to_special_dirs.cc", "//base/test/scoped_block_tests_writing_to_special_dirs.h", "//base/test/scoped_command_line.cc", "//base/test/scoped_command_line.h", "//base/test/scoped_feature_list.cc", "//base/test/scoped_feature_list.h", "//base/test/scoped_mock_clock_override.cc", "//base/test/scoped_mock_clock_override.h", "//base/test/scoped_mock_time_message_loop_task_runner.cc", "//base/test/scoped_mock_time_message_loop_task_runner.h", "//base/test/scoped_path_override.cc", "//base/test/scoped_path_override.h", "//base/test/scoped_run_loop_timeout.cc", "//base/test/scoped_run_loop_timeout.h", "//base/test/sequenced_task_runner_test_template.cc", "//base/test/sequenced_task_runner_test_template.h", "//base/test/simple_test_clock.cc", "//base/test/simple_test_clock.h", "//base/test/simple_test_tick_clock.cc", "//base/test/simple_test_tick_clock.h", "//base/test/task_environment.cc", "//base/test/task_environment.h", "//base/test/task_runner_test_template.cc", "//base/test/task_runner_test_template.h", "//base/test/test_discardable_memory_allocator.cc", "//base/test/test_discardable_memory_allocator.h", "//base/test/test_file_util.cc", "//base/test/test_file_util.h", "//base/test/test_future.h", "//base/test/test_future_internal.h", "//base/test/test_io_thread.cc", "//base/test/test_io_thread.h", "//base/test/test_message_loop.cc", "//base/test/test_message_loop.h", "//base/test/test_mock_time_task_runner.cc", "//base/test/test_mock_time_task_runner.h", "//base/test/test_pending_task.cc", "//base/test/test_pending_task.h", "//base/test/test_shared_memory_util.cc", "//base/test/test_shared_memory_util.h", "//base/test/test_simple_task_runner.cc", "//base/test/test_simple_task_runner.h", "//base/test/test_suite.cc", "//base/test/test_suite.h", "//base/test/test_waitable_event.cc", "//base/test/test_waitable_event.h", "//base/test/thread_test_helper.cc", "//base/test/thread_test_helper.h", "//base/test/to_vector.h", "//base/test/values_test_util.cc", "//base/test/values_test_util.h", "//base/test/with_feature_override.cc", "//base/test/with_feature_override.h", "//base/test/android/java_handler_thread_helpers.cc", "//base/test/android/java_handler_thread_helpers.h", "//base/test/android/url_utils.cc", "//base/test/android/url_utils.h", "//base/test/multiprocess_test_android.cc", "//base/test/reached_code_profiler_android.cc", "//base/test/test_file_util_android.cc", "//base/test/test_file_util_linux.cc", "//base/test/test_support_android.cc", "//base/test/test_support_android.h", "//base/test/thread_pool_test_helpers_android.cc", "//base/test/scoped_locale.cc", "//base/test/scoped_locale.h", "//base/test/test_file_util_posix.cc", "//base/test/launcher/test_launcher.cc", "//base/test/launcher/test_launcher.h", "//base/test/launcher/test_launcher_test_utils.cc", "//base/test/launcher/test_launcher_test_utils.h", "//base/test/launcher/test_launcher_tracer.cc", "//base/test/launcher/test_launcher_tracer.h", "//base/test/launcher/test_results_tracker.cc", "//base/test/launcher/unit_test_launcher.cc", "//base/test/multiprocess_test.cc" ],
       "swiftflags": [ "-file-compilation-dir=." ],
@@ -1196,6 +1180,7 @@
       "metadata": {
          "all_deps": [ "//base:base_java", "//base:process_launcher_java", "//testing/android/native_test:native_main_runner_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/jni_zero:jni_zero_java", "//base/test:test_support_java_aidl" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/test/android/java/src/org/chromium/base/GarbageCollectionTestUtils.java", "//base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService0.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService1.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService2.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService3.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService4.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService5.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService6.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService7.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService8.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientService9.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientServiceDelegate.java" ],
          "target_type": [ "java_library" ]
       },
@@ -1339,6 +1324,19 @@
       "visibility": [ "*" ]
    },
    "//base/test:test_support_jni_headers": {
+      "deps": [ "//base/test:test_support_jni_headers__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": true,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base/test:test_support_jni_headers__action": {
       "args": [ "from-source", "--output-dir", "gen/jni_headers/base/test/test_support_jni_headers", "--extra-include", "../../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/base/test/test_support_jni_headers.srcjar", "--use-proxy-hash", "--output-name", "MainReturnCodeResult_jni.h", "--output-name", "MultiprocessTestClientLauncher_jni.h", "--output-name", "ReachedCodeProfiler_jni.h", "--output-name", "ThreadPoolTestHelpers_jni.h", "--output-name", "UrlUtils_jni.h", "--input-file=../../base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java", "--input-file=../../base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java", "--input-file=../../base/test/android/javatests/src/org/chromium/base/test/ReachedCodeProfiler.java", "--input-file=../../base/test/android/javatests/src/org/chromium/base/test/task/ThreadPoolTestHelpers.java", "--input-file=../../base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java", "//base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java", "//base/test/android/javatests/src/org/chromium/base/test/ReachedCodeProfiler.java", "//base/test/android/javatests/src/org/chromium/base/test/task/ThreadPoolTestHelpers.java", "//base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -1348,9 +1346,9 @@
       },
       "outputs": [ "//out/cronet/gen/base/test/test_support_jni_headers.srcjar", "//out/cronet/gen/jni_headers/base/test/test_support_jni_headers/MainReturnCodeResult_jni.h", "//out/cronet/gen/jni_headers/base/test/test_support_jni_headers/MultiprocessTestClientLauncher_jni.h", "//out/cronet/gen/jni_headers/base/test/test_support_jni_headers/ReachedCodeProfiler_jni.h", "//out/cronet/gen/jni_headers/base/test/test_support_jni_headers/ThreadPoolTestHelpers_jni.h", "//out/cronet/gen/jni_headers/base/test/test_support_jni_headers/UrlUtils_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
-      "testonly": true,
+      "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "action",
       "visibility": [ "*" ]
@@ -1360,20 +1358,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/test:perf_test_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "PERF_TEST", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/test:perf_test_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "PERF_TEST", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
       "deps": [ "//base:base", "//base/test:test_support", "//testing/gtest:gtest" ],
       "externs": {
 
       },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/re2/src/" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -1392,20 +1390,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-unused-const-variable", "-Wno-unused-function" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-unused-const-variable", "-Wno-unused-function" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/third_party/double_conversion:config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/third_party/double_conversion:config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -1424,20 +1422,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-unused-const-variable", "-Wno-unused-function" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-unused-const-variable", "-Wno-unused-function" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/third_party/double_conversion:config" ],
-      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/third_party/double_conversion:config" ],
+      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "metadata": {
 
       },
@@ -1455,20 +1453,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Werror" ],
+      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Werror" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:optimize_max", "//build/config/compiler:no_chromium_code" ],
-      "defines": [ "OFFICIAL_BUILD", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:optimize_max", "//build/config/compiler:no_chromium_code" ],
+      "defines": [ "OFFICIAL_BUILD", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Werror" ],
+      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Werror" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -1487,20 +1485,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Werror" ],
+      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Werror" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:no_chromium_code" ],
-      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:no_chromium_code" ],
+      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Werror" ],
+      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Werror" ],
       "metadata": {
 
       },
@@ -1546,6 +1544,19 @@
       "visibility": [ "*" ]
    },
    "//base:android_runtime_jni_headers": {
+      "deps": [ "//base:android_runtime_jni_headers__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": false,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base:android_runtime_jni_headers__action": {
       "args": [ "from-jar", "--output-dir", "gen/jni_headers/base/android_runtime_jni_headers", "--extra-include", "../../../../../../third_party/jni_zero/jni_zero_helper.h", "--jar-file", "../../third_party/android_sdk/public/platforms/android-34/android.jar", "--javap", "../../third_party/jdk/current/bin/javap", "--output-name", "Runtime_jni.h", "--output-name", "Throwable_jni.h", "--input-file=java/lang/Runtime.class", "--input-file=java/lang/Throwable.class" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//third_party/android_sdk/public/platforms/android-34/android.jar", "//third_party/jdk/current/bin/javap", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -1554,7 +1565,7 @@
       },
       "outputs": [ "//out/cronet/gen/jni_headers/base/android_runtime_jni_headers/Runtime_jni.h", "//out/cronet/gen/jni_headers/base/android_runtime_jni_headers/Throwable_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -1562,6 +1573,19 @@
       "visibility": [ "*" ]
    },
    "//base:android_runtime_unchecked_jni_headers": {
+      "deps": [ "//base:android_runtime_unchecked_jni_headers__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": false,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base:android_runtime_unchecked_jni_headers__action": {
       "args": [ "from-jar", "--output-dir", "gen/jni_headers/base/android_runtime_unchecked_jni_headers", "--extra-include", "../../../../../../third_party/jni_zero/jni_zero_helper.h", "--jar-file", "../../third_party/android_sdk/public/platforms/android-34/android.jar", "--javap", "../../third_party/jdk/current/bin/javap", "--unchecked-exceptions", "--output-name", "Runnable_jni.h", "--input-file=java/lang/Runnable.class" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//third_party/android_sdk/public/platforms/android-34/android.jar", "//third_party/jdk/current/bin/javap", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -1570,7 +1594,7 @@
       },
       "outputs": [ "//out/cronet/gen/jni_headers/base/android_runtime_unchecked_jni_headers/Runnable_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -1581,20 +1605,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -1612,20 +1636,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wshorten-64-to-32", "-Wimplicit-int-conversion", "-Wsign-compare", "-Wsign-conversion", "-Wtautological-unsigned-zero-compare", "-Wexit-time-destructors", "-Wglobal-constructors", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wshorten-64-to-32", "-Wimplicit-int-conversion", "-Wsign-compare", "-Wsign-conversion", "-Wtautological-unsigned-zero-compare", "-Wexit-time-destructors", "-Wglobal-constructors", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:precompiled_headers", "//build/config/compiler:prevent_unsafe_narrowing", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wglobal_constructors", "//build/config/compiler:optimize_max", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/jni_zero:jni_include_dir", "//third_party/cpu_features:ndk_compat_headers", "//third_party/icu:icu_config" ],
-      "defines": [ "BASE_IMPLEMENTATION", "IS_RAW_PTR_IMPL", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:precompiled_headers", "//build/config/compiler:prevent_unsafe_narrowing", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wglobal_constructors", "//build/config/compiler:optimize_max", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir", "//third_party/cpu_features:ndk_compat_headers", "//third_party/icu:icu_config" ],
+      "defines": [ "BASE_IMPLEMENTATION", "IS_RAW_PTR_IMPL", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "USE_CHROMIUM_BASE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
       "deps": [ "//base:anchor_functions_buildflags", "//base:base_jni", "//base:base_shared_preferences_jni", "//base:base_static", "//base:build_date", "//base:cfi_buildflags", "//base:clang_profiling_buildflags", "//base:debugging_buildflags", "//base:feature_list_buildflags", "//base:ios_cronet_buildflags", "//base:logging_buildflags", "//base:message_pump_buildflags", "//base:nodebug_assertion", "//base:orderfile_buildflags", "//base:power_monitor_buildflags", "//base:process_launcher_jni", "//base:profiler_buildflags", "//base:rust_buildflags", "//base:sanitizer_buildflags", "//base:synchronization_buildflags", "//base:tracing_buildflags", "//base/allocator:buildflags", "//base/allocator/partition_allocator:buildflags", "//base/allocator/partition_allocator:partition_alloc", "//base/allocator/partition_allocator:raw_ptr", "//base/numerics:base_numerics", "//base/third_party/double_conversion:double_conversion", "//base/third_party/dynamic_annotations:dynamic_annotations", "//build:blink_buildflags", "//build:branding_buildflags", "//build:chromecast_buildflags", "//build:chromeos_buildflags", "//build/config/compiler:compiler_buildflags", "//third_party/abseil-cpp:absl", "//third_party/ashmem:ashmem", "//third_party/boringssl:boringssl", "//third_party/cpu_features:ndk_compat", "//third_party/icu:icui18n", "//third_party/icu:icuuc", "//third_party/libevent:libevent", "//third_party/modp_b64:modp_b64" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//out/cronet/gen/jni_headers/", "//third_party/cpu_features/src/ndk_compat/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "//base/android/library_loader/anchor_functions.lds", "android_support", "android", "log" ],
       "metadata": {
 
@@ -1634,7 +1658,7 @@
       "public": "*",
       "public_configs": [ "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config" ],
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
-      "sources": [ "//base/allocator/allocator_check.cc", "//base/allocator/allocator_check.h", "//base/allocator/allocator_extension.cc", "//base/allocator/allocator_extension.h", "//base/allocator/dispatcher/configuration.h", "//base/allocator/dispatcher/dispatcher.cc", "//base/allocator/dispatcher/dispatcher.h", "//base/allocator/dispatcher/initializer.h", "//base/allocator/dispatcher/internal/dispatch_data.cc", "//base/allocator/dispatcher/internal/dispatch_data.h", "//base/allocator/dispatcher/internal/dispatcher_internal.h", "//base/allocator/dispatcher/internal/tools.h", "//base/allocator/dispatcher/reentry_guard.cc", "//base/allocator/dispatcher/reentry_guard.h", "//base/allocator/dispatcher/subsystem.h", "//base/allocator/dispatcher/tls.cc", "//base/allocator/dispatcher/tls.h", "//base/at_exit.cc", "//base/at_exit.h", "//base/atomic_ref_count.h", "//base/atomic_sequence_num.h", "//base/atomicops.h", "//base/atomicops_internals_atomicword_compat.h", "//base/atomicops_internals_portable.h", "//base/auto_reset.h", "//base/barrier_callback.h", "//base/barrier_closure.cc", "//base/barrier_closure.h", "//base/base64.cc", "//base/base64.h", "//base/base64url.cc", "//base/base64url.h", "//base/base_switches.h", "//base/big_endian.cc", "//base/big_endian.h", "//base/bit_cast.h", "//base/bits.h", "//base/build_time.h", "//base/callback_list.cc", "//base/callback_list.h", "//base/cancelable_callback.h", "//base/check.cc", "//base/check.h", "//base/check_deref.h", "//base/check_is_test.cc", "//base/check_is_test.h", "//base/check_op.cc", "//base/check_op.h", "//base/command_line.cc", "//base/command_line.h", "//base/compiler_specific.h", "//base/component_export.h", "//base/containers/adapters.h", "//base/containers/buffer_iterator.h", "//base/containers/checked_iterators.h", "//base/containers/circular_deque.h", "//base/containers/contains.h", "//base/containers/contiguous_iterator.h", "//base/containers/cxx20_erase.h", "//base/containers/cxx20_erase_deque.h", "//base/containers/cxx20_erase_forward_list.h", "//base/containers/cxx20_erase_internal.h", "//base/containers/cxx20_erase_list.h", "//base/containers/cxx20_erase_map.h", "//base/containers/cxx20_erase_set.h", "//base/containers/cxx20_erase_string.h", "//base/containers/cxx20_erase_unordered_map.h", "//base/containers/cxx20_erase_unordered_set.h", "//base/containers/cxx20_erase_vector.h", "//base/containers/enum_set.h", "//base/containers/extend.h", "//base/containers/fixed_flat_map.h", "//base/containers/fixed_flat_set.h", "//base/containers/flat_map.h", "//base/containers/flat_set.h", "//base/containers/flat_tree.cc", "//base/containers/flat_tree.h", "//base/containers/id_map.h", "//base/containers/intrusive_heap.cc", "//base/containers/intrusive_heap.h", "//base/containers/linked_list.cc", "//base/containers/linked_list.h", "//base/containers/lru_cache.h", "//base/containers/map_util.h", "//base/containers/small_map.h", "//base/containers/span.h", "//base/containers/stack.h", "//base/containers/unique_ptr_adapters.h", "//base/containers/util.h", "//base/containers/vector_buffer.h", "//base/cpu_reduction_experiment.cc", "//base/cpu_reduction_experiment.h", "//base/critical_closure.h", "//base/cxx20_is_constant_evaluated.h", "//base/cxx20_to_address.h", "//base/dcheck_is_on.h", "//base/debug/alias.cc", "//base/debug/alias.h", "//base/debug/asan_invalid_access.cc", "//base/debug/asan_invalid_access.h", "//base/debug/asan_service.cc", "//base/debug/asan_service.h", "//base/debug/buffered_dwarf_reader.cc", "//base/debug/buffered_dwarf_reader.h", "//base/debug/debugger.cc", "//base/debug/debugger.h", "//base/debug/dump_without_crashing.cc", "//base/debug/dump_without_crashing.h", "//base/debug/dwarf_line_no.cc", "//base/debug/dwarf_line_no.h", "//base/debug/leak_annotations.h", "//base/debug/profiler.cc", "//base/debug/profiler.h", "//base/debug/task_trace.cc", "//base/debug/task_trace.h", "//base/environment.cc", "//base/environment.h", "//base/export_template.h", "//base/feature_list.cc", "//base/feature_list.h", "//base/features.cc", "//base/features.h", "//base/file_version_info.h", "//base/files/block_tests_writing_to_special_dirs.cc", "//base/files/block_tests_writing_to_special_dirs.h", "//base/files/dir_reader_fallback.h", "//base/files/file.cc", "//base/files/file.h", "//base/files/file_error_or.h", "//base/files/file_path.cc", "//base/files/file_path.h", "//base/files/file_tracing.cc", "//base/files/file_tracing.h", "//base/files/memory_mapped_file.cc", "//base/files/memory_mapped_file.h", "//base/files/platform_file.h", "//base/files/safe_base_name.cc", "//base/files/safe_base_name.h", "//base/files/scoped_file.cc", "//base/files/scoped_file.h", "//base/format_macros.h", "//base/functional/bind.h", "//base/functional/bind_internal.h", "//base/functional/callback.h", "//base/functional/callback_forward.h", "//base/functional/callback_helpers.cc", "//base/functional/callback_helpers.h", "//base/functional/callback_internal.cc", "//base/functional/callback_internal.h", "//base/functional/callback_tags.h", "//base/functional/disallow_unretained.h", "//base/functional/function_ref.h", "//base/functional/identity.h", "//base/functional/invoke.h", "//base/functional/not_fn.h", "//base/functional/overloaded.h", "//base/functional/unretained_traits.h", "//base/gtest_prod_util.h", "//base/hash/hash.cc", "//base/hash/hash.h", "//base/hash/legacy_hash.cc", "//base/hash/legacy_hash.h", "//base/json/json_common.h", "//base/json/json_parser.cc", "//base/json/json_parser.h", "//base/json/json_reader.cc", "//base/json/json_reader.h", "//base/json/json_string_value_serializer.cc", "//base/json/json_string_value_serializer.h", "//base/json/json_value_converter.cc", "//base/json/json_value_converter.h", "//base/json/json_writer.cc", "//base/json/json_writer.h", "//base/json/string_escape.cc", "//base/json/string_escape.h", "//base/json/values_util.cc", "//base/json/values_util.h", "//base/lazy_instance.h", "//base/lazy_instance_helpers.cc", "//base/lazy_instance_helpers.h", "//base/linux_util.cc", "//base/linux_util.h", "//base/location.cc", "//base/location.h", "//base/logging.cc", "//base/logging.h", "//base/macros/concat.h", "//base/macros/if.h", "//base/macros/remove_parens.h", "//base/macros/uniquify.h", "//base/memory/aligned_memory.cc", "//base/memory/aligned_memory.h", "//base/memory/free_deleter.h", "//base/memory/memory_pressure_listener.cc", "//base/memory/memory_pressure_listener.h", "//base/memory/memory_pressure_monitor.cc", "//base/memory/memory_pressure_monitor.h", "//base/memory/nonscannable_memory.cc", "//base/memory/nonscannable_memory.h", "//base/memory/page_size.h", "//base/memory/platform_shared_memory_handle.cc", "//base/memory/platform_shared_memory_handle.h", "//base/memory/platform_shared_memory_mapper.h", "//base/memory/platform_shared_memory_region.cc", "//base/memory/platform_shared_memory_region.h", "//base/memory/ptr_util.h", "//base/memory/raw_ptr.h", "//base/memory/raw_ptr_asan_bound_arg_tracker.cc", "//base/memory/raw_ptr_asan_bound_arg_tracker.h", "//base/memory/raw_ptr_asan_hooks.cc", "//base/memory/raw_ptr_asan_hooks.h", "//base/memory/raw_ptr_asan_service.cc", "//base/memory/raw_ptr_asan_service.h", "//base/memory/raw_ptr_cast.h", "//base/memory/raw_ptr_exclusion.h", "//base/memory/raw_ref.h", "//base/memory/raw_scoped_refptr_mismatch_checker.h", "//base/memory/raw_span.h", "//base/memory/read_only_shared_memory_region.cc", "//base/memory/read_only_shared_memory_region.h", "//base/memory/ref_counted.cc", "//base/memory/ref_counted.h", "//base/memory/ref_counted_delete_on_sequence.h", "//base/memory/ref_counted_memory.cc", "//base/memory/ref_counted_memory.h", "//base/memory/safe_ref.h", "//base/memory/safe_ref_traits.h", "//base/memory/safety_checks.h", "//base/memory/scoped_policy.h", "//base/memory/scoped_refptr.h", "//base/memory/shared_memory_hooks.h", "//base/memory/shared_memory_mapper.cc", "//base/memory/shared_memory_mapper.h", "//base/memory/shared_memory_mapping.cc", "//base/memory/shared_memory_mapping.h", "//base/memory/shared_memory_security_policy.cc", "//base/memory/shared_memory_security_policy.h", "//base/memory/shared_memory_tracker.cc", "//base/memory/shared_memory_tracker.h", "//base/memory/singleton.h", "//base/memory/stack_allocated.h", "//base/memory/unsafe_shared_memory_pool.cc", "//base/memory/unsafe_shared_memory_pool.h", "//base/memory/unsafe_shared_memory_region.cc", "//base/memory/unsafe_shared_memory_region.h", "//base/memory/values_equivalent.h", "//base/memory/weak_auto_reset.h", "//base/memory/weak_ptr.cc", "//base/memory/weak_ptr.h", "//base/memory/writable_shared_memory_region.cc", "//base/memory/writable_shared_memory_region.h", "//base/message_loop/message_pump.cc", "//base/message_loop/message_pump.h", "//base/message_loop/message_pump_default.cc", "//base/message_loop/message_pump_default.h", "//base/message_loop/message_pump_for_io.h", "//base/message_loop/message_pump_for_ui.h", "//base/message_loop/message_pump_type.h", "//base/message_loop/work_id_provider.cc", "//base/message_loop/work_id_provider.h", "//base/metrics/bucket_ranges.cc", "//base/metrics/bucket_ranges.h", "//base/metrics/crc32.cc", "//base/metrics/crc32.h", "//base/metrics/dummy_histogram.cc", "//base/metrics/dummy_histogram.h", "//base/metrics/field_trial.cc", "//base/metrics/field_trial.h", "//base/metrics/field_trial_list_including_low_anonymity.cc", "//base/metrics/field_trial_list_including_low_anonymity.h", "//base/metrics/field_trial_param_associator.cc", "//base/metrics/field_trial_param_associator.h", "//base/metrics/field_trial_params.cc", "//base/metrics/field_trial_params.h", "//base/metrics/histogram.cc", "//base/metrics/histogram.h", "//base/metrics/histogram_base.cc", "//base/metrics/histogram_base.h", "//base/metrics/histogram_delta_serialization.cc", "//base/metrics/histogram_delta_serialization.h", "//base/metrics/histogram_flattener.h", "//base/metrics/histogram_functions.cc", "//base/metrics/histogram_functions.h", "//base/metrics/histogram_macros.h", "//base/metrics/histogram_macros_internal.h", "//base/metrics/histogram_macros_local.h", "//base/metrics/histogram_samples.cc", "//base/metrics/histogram_samples.h", "//base/metrics/histogram_shared_memory.cc", "//base/metrics/histogram_shared_memory.h", "//base/metrics/histogram_snapshot_manager.cc", "//base/metrics/histogram_snapshot_manager.h", "//base/metrics/metrics_hashes.cc", "//base/metrics/metrics_hashes.h", "//base/metrics/persistent_histogram_allocator.cc", "//base/metrics/persistent_histogram_allocator.h", "//base/metrics/persistent_memory_allocator.cc", "//base/metrics/persistent_memory_allocator.h", "//base/metrics/persistent_sample_map.cc", "//base/metrics/persistent_sample_map.h", "//base/metrics/ranges_manager.cc", "//base/metrics/ranges_manager.h", "//base/metrics/record_histogram_checker.h", "//base/metrics/sample_map.cc", "//base/metrics/sample_map.h", "//base/metrics/sample_vector.cc", "//base/metrics/sample_vector.h", "//base/metrics/single_sample_metrics.cc", "//base/metrics/single_sample_metrics.h", "//base/metrics/sparse_histogram.cc", "//base/metrics/sparse_histogram.h", "//base/metrics/statistics_recorder.cc", "//base/metrics/statistics_recorder.h", "//base/metrics/user_metrics.cc", "//base/metrics/user_metrics.h", "//base/metrics/user_metrics_action.h", "//base/no_destructor.h", "//base/notreached.h", "//base/observer_list.h", "//base/observer_list_internal.cc", "//base/observer_list_internal.h", "//base/observer_list_threadsafe.cc", "//base/observer_list_threadsafe.h", "//base/observer_list_types.cc", "//base/observer_list_types.h", "//base/one_shot_event.cc", "//base/one_shot_event.h", "//base/parameter_pack.h", "//base/pending_task.cc", "//base/pending_task.h", "//base/pickle.cc", "//base/pickle.h", "//base/power_monitor/battery_level_provider.cc", "//base/power_monitor/battery_level_provider.h", "//base/power_monitor/battery_state_sampler.cc", "//base/power_monitor/battery_state_sampler.h", "//base/power_monitor/power_monitor.cc", "//base/power_monitor/power_monitor.h", "//base/power_monitor/power_monitor_device_source.cc", "//base/power_monitor/power_monitor_device_source.h", "//base/power_monitor/power_monitor_features.cc", "//base/power_monitor/power_monitor_features.h", "//base/power_monitor/power_monitor_source.cc", "//base/power_monitor/power_monitor_source.h", "//base/power_monitor/power_observer.h", "//base/power_monitor/sampling_event_source.cc", "//base/power_monitor/sampling_event_source.h", "//base/power_monitor/timer_sampling_event_source.cc", "//base/power_monitor/timer_sampling_event_source.h", "//base/process/current_process.cc", "//base/process/current_process.h", "//base/process/current_process_test.h", "//base/process/environment_internal.cc", "//base/process/environment_internal.h", "//base/process/process.h", "//base/process/process_handle.cc", "//base/process/process_handle.h", "//base/process/process_info.h", "//base/process/process_metrics_iocounters.h", "//base/profiler/frame.cc", "//base/profiler/frame.h", "//base/profiler/metadata_recorder.cc", "//base/profiler/metadata_recorder.h", "//base/profiler/module_cache.cc", "//base/profiler/module_cache.h", "//base/profiler/profile_builder.h", "//base/profiler/register_context.h", "//base/profiler/sample_metadata.cc", "//base/profiler/sample_metadata.h", "//base/profiler/sampling_profiler_thread_token.cc", "//base/profiler/sampling_profiler_thread_token.h", "//base/profiler/stack_buffer.cc", "//base/profiler/stack_buffer.h", "//base/profiler/stack_copier.cc", "//base/profiler/stack_copier.h", "//base/profiler/stack_copier_suspend.cc", "//base/profiler/stack_copier_suspend.h", "//base/profiler/stack_sampler.cc", "//base/profiler/stack_sampler.h", "//base/profiler/stack_sampling_profiler.cc", "//base/profiler/stack_sampling_profiler.h", "//base/profiler/suspendable_thread_delegate.h", "//base/profiler/thread_delegate.h", "//base/profiler/unwinder.cc", "//base/profiler/unwinder.h", "//base/rand_util.cc", "//base/rand_util.h", "//base/ranges/algorithm.h", "//base/ranges/functional.h", "//base/ranges/ranges.h", "//base/run_loop.cc", "//base/run_loop.h", "//base/sampling_heap_profiler/lock_free_address_hash_set.cc", "//base/sampling_heap_profiler/lock_free_address_hash_set.h", "//base/sampling_heap_profiler/poisson_allocation_sampler.cc", "//base/sampling_heap_profiler/poisson_allocation_sampler.h", "//base/sampling_heap_profiler/sampling_heap_profiler.cc", "//base/sampling_heap_profiler/sampling_heap_profiler.h", "//base/scoped_add_feature_flags.cc", "//base/scoped_add_feature_flags.h", "//base/scoped_clear_last_error.h", "//base/scoped_environment_variable_override.cc", "//base/scoped_environment_variable_override.h", "//base/scoped_generic.h", "//base/scoped_multi_source_observation.h", "//base/scoped_observation.h", "//base/scoped_observation_traits.h", "//base/scoped_observation_traits_internal.h", "//base/sequence_checker.cc", "//base/sequence_checker.h", "//base/sequence_checker_impl.cc", "//base/sequence_checker_impl.h", "//base/sequence_token.cc", "//base/sequence_token.h", "//base/state_transitions.h", "//base/stl_util.h", "//base/strings/abseil_string_number_conversions.cc", "//base/strings/abseil_string_number_conversions.h", "//base/strings/escape.cc", "//base/strings/escape.h", "//base/strings/latin1_string_conversions.cc", "//base/strings/latin1_string_conversions.h", "//base/strings/pattern.cc", "//base/strings/pattern.h", "//base/strings/safe_sprintf.cc", "//base/strings/safe_sprintf.h", "//base/strings/strcat.cc", "//base/strings/strcat.h", "//base/strings/strcat_internal.h", "//base/strings/string_number_conversions.cc", "//base/strings/string_number_conversions.h", "//base/strings/string_number_conversions_internal.h", "//base/strings/string_piece.h", "//base/strings/string_piece_forward.h", "//base/strings/string_split.cc", "//base/strings/string_split.h", "//base/strings/string_split_internal.h", "//base/strings/string_tokenizer.h", "//base/strings/string_util.cc", "//base/strings/string_util.h", "//base/strings/string_util_constants.cc", "//base/strings/string_util_impl_helpers.h", "//base/strings/string_util_internal.h", "//base/strings/stringize_macros.h", "//base/strings/stringprintf.cc", "//base/strings/stringprintf.h", "//base/strings/sys_string_conversions.h", "//base/strings/to_string.h", "//base/strings/utf_offset_string_conversions.cc", "//base/strings/utf_offset_string_conversions.h", "//base/strings/utf_ostream_operators.cc", "//base/strings/utf_ostream_operators.h", "//base/strings/utf_string_conversion_utils.cc", "//base/strings/utf_string_conversion_utils.h", "//base/strings/utf_string_conversions.cc", "//base/strings/utf_string_conversions.h", "//base/substring_set_matcher/matcher_string_pattern.cc", "//base/substring_set_matcher/matcher_string_pattern.h", "//base/substring_set_matcher/substring_set_matcher.cc", "//base/substring_set_matcher/substring_set_matcher.h", "//base/supports_user_data.cc", "//base/supports_user_data.h", "//base/synchronization/atomic_flag.cc", "//base/synchronization/atomic_flag.h", "//base/synchronization/condition_variable.h", "//base/synchronization/lock.cc", "//base/synchronization/lock.h", "//base/synchronization/lock_impl.h", "//base/synchronization/waitable_event.cc", "//base/synchronization/waitable_event.h", "//base/synchronization/waitable_event_watcher.h", "//base/sys_byteorder.h", "//base/syslog_logging.cc", "//base/syslog_logging.h", "//base/system/system_monitor.cc", "//base/system/system_monitor.h", "//base/task/bind_post_task.h", "//base/task/bind_post_task_internal.h", "//base/task/cancelable_task_tracker.cc", "//base/task/cancelable_task_tracker.h", "//base/task/common/checked_lock.h", "//base/task/common/checked_lock_impl.cc", "//base/task/common/checked_lock_impl.h", "//base/task/common/lazy_now.cc", "//base/task/common/lazy_now.h", "//base/task/common/operations_controller.cc", "//base/task/common/operations_controller.h", "//base/task/common/scoped_defer_task_posting.cc", "//base/task/common/scoped_defer_task_posting.h", "//base/task/common/task_annotator.cc", "//base/task/common/task_annotator.h", "//base/task/current_thread.cc", "//base/task/current_thread.h", "//base/task/default_delayed_task_handle_delegate.cc", "//base/task/default_delayed_task_handle_delegate.h", "//base/task/deferred_sequenced_task_runner.cc", "//base/task/deferred_sequenced_task_runner.h", "//base/task/delay_policy.h", "//base/task/delayed_task_handle.cc", "//base/task/delayed_task_handle.h", "//base/task/lazy_thread_pool_task_runner.cc", "//base/task/lazy_thread_pool_task_runner.h", "//base/task/post_job.cc", "//base/task/post_job.h", "//base/task/post_task_and_reply_with_result_internal.h", "//base/task/scoped_set_task_priority_for_current_thread.cc", "//base/task/scoped_set_task_priority_for_current_thread.h", "//base/task/sequence_manager/associated_thread_id.cc", "//base/task/sequence_manager/associated_thread_id.h", "//base/task/sequence_manager/atomic_flag_set.cc", "//base/task/sequence_manager/atomic_flag_set.h", "//base/task/sequence_manager/delayed_task_handle_delegate.cc", "//base/task/sequence_manager/delayed_task_handle_delegate.h", "//base/task/sequence_manager/enqueue_order.h", "//base/task/sequence_manager/enqueue_order_generator.cc", "//base/task/sequence_manager/enqueue_order_generator.h", "//base/task/sequence_manager/fence.cc", "//base/task/sequence_manager/fence.h", "//base/task/sequence_manager/lazily_deallocated_deque.h", "//base/task/sequence_manager/sequence_manager.cc", "//base/task/sequence_manager/sequence_manager.h", "//base/task/sequence_manager/sequence_manager_impl.cc", "//base/task/sequence_manager/sequence_manager_impl.h", "//base/task/sequence_manager/sequenced_task_source.cc", "//base/task/sequence_manager/sequenced_task_source.h", "//base/task/sequence_manager/task_order.cc", "//base/task/sequence_manager/task_order.h", "//base/task/sequence_manager/task_queue.cc", "//base/task/sequence_manager/task_queue.h", "//base/task/sequence_manager/task_queue_impl.cc", "//base/task/sequence_manager/task_queue_impl.h", "//base/task/sequence_manager/task_queue_selector.cc", "//base/task/sequence_manager/task_queue_selector.h", "//base/task/sequence_manager/task_time_observer.h", "//base/task/sequence_manager/tasks.cc", "//base/task/sequence_manager/tasks.h", "//base/task/sequence_manager/thread_controller.cc", "//base/task/sequence_manager/thread_controller.h", "//base/task/sequence_manager/thread_controller_impl.cc", "//base/task/sequence_manager/thread_controller_impl.h", "//base/task/sequence_manager/thread_controller_power_monitor.cc", "//base/task/sequence_manager/thread_controller_power_monitor.h", "//base/task/sequence_manager/thread_controller_with_message_pump_impl.cc", "//base/task/sequence_manager/thread_controller_with_message_pump_impl.h", "//base/task/sequence_manager/time_domain.cc", "//base/task/sequence_manager/time_domain.h", "//base/task/sequence_manager/wake_up_queue.cc", "//base/task/sequence_manager/wake_up_queue.h", "//base/task/sequence_manager/work_deduplicator.cc", "//base/task/sequence_manager/work_deduplicator.h", "//base/task/sequence_manager/work_queue.cc", "//base/task/sequence_manager/work_queue.h", "//base/task/sequence_manager/work_queue_sets.cc", "//base/task/sequence_manager/work_queue_sets.h", "//base/task/sequenced_task_runner.cc", "//base/task/sequenced_task_runner.h", "//base/task/sequenced_task_runner_helpers.h", "//base/task/single_thread_task_executor.cc", "//base/task/single_thread_task_executor.h", "//base/task/single_thread_task_runner.cc", "//base/task/single_thread_task_runner.h", "//base/task/single_thread_task_runner_thread_mode.h", "//base/task/task_features.cc", "//base/task/task_features.h", "//base/task/task_observer.h", "//base/task/task_runner.cc", "//base/task/task_runner.h", "//base/task/task_traits.cc", "//base/task/task_traits.h", "//base/task/thread_pool.cc", "//base/task/thread_pool.h", "//base/task/thread_pool/delayed_priority_queue.cc", "//base/task/thread_pool/delayed_priority_queue.h", "//base/task/thread_pool/delayed_task_manager.cc", "//base/task/thread_pool/delayed_task_manager.h", "//base/task/thread_pool/environment_config.cc", "//base/task/thread_pool/environment_config.h", "//base/task/thread_pool/job_task_source.cc", "//base/task/thread_pool/job_task_source.h", "//base/task/thread_pool/pooled_parallel_task_runner.cc", "//base/task/thread_pool/pooled_parallel_task_runner.h", "//base/task/thread_pool/pooled_sequenced_task_runner.cc", "//base/task/thread_pool/pooled_sequenced_task_runner.h", "//base/task/thread_pool/pooled_single_thread_task_runner_manager.cc", "//base/task/thread_pool/pooled_single_thread_task_runner_manager.h", "//base/task/thread_pool/pooled_task_runner_delegate.cc", "//base/task/thread_pool/pooled_task_runner_delegate.h", "//base/task/thread_pool/priority_queue.cc", "//base/task/thread_pool/priority_queue.h", "//base/task/thread_pool/semaphore.h", "//base/task/thread_pool/sequence.cc", "//base/task/thread_pool/sequence.h", "//base/task/thread_pool/service_thread.cc", "//base/task/thread_pool/service_thread.h", "//base/task/thread_pool/task.cc", "//base/task/thread_pool/task.h", "//base/task/thread_pool/task_source.cc", "//base/task/thread_pool/task_source.h", "//base/task/thread_pool/task_source_sort_key.cc", "//base/task/thread_pool/task_source_sort_key.h", "//base/task/thread_pool/task_tracker.cc", "//base/task/thread_pool/task_tracker.h", "//base/task/thread_pool/thread_group.cc", "//base/task/thread_pool/thread_group.h", "//base/task/thread_pool/thread_group_impl.cc", "//base/task/thread_pool/thread_group_impl.h", "//base/task/thread_pool/thread_pool_impl.cc", "//base/task/thread_pool/thread_pool_impl.h", "//base/task/thread_pool/thread_pool_instance.cc", "//base/task/thread_pool/thread_pool_instance.h", "//base/task/thread_pool/tracked_ref.h", "//base/task/thread_pool/worker_thread.cc", "//base/task/thread_pool/worker_thread.h", "//base/task/thread_pool/worker_thread_observer.h", "//base/task/thread_pool/worker_thread_set.cc", "//base/task/thread_pool/worker_thread_set.h", "//base/task/updateable_sequenced_task_runner.h", "//base/template_util.h", "//base/test/scoped_logging_settings.h", "//base/test/spin_wait.h", "//base/third_party/cityhash/city.cc", "//base/third_party/cityhash/city.h", "//base/third_party/cityhash_v103/src/city_v103.cc", "//base/third_party/cityhash_v103/src/city_v103.h", "//base/third_party/icu/icu_utf.h", "//base/third_party/nspr/prtime.cc", "//base/third_party/nspr/prtime.h", "//base/third_party/superfasthash/superfasthash.c", "//base/thread_annotations.h", "//base/threading/hang_watcher.cc", "//base/threading/hang_watcher.h", "//base/threading/platform_thread.cc", "//base/threading/platform_thread.h", "//base/threading/platform_thread_ref.cc", "//base/threading/platform_thread_ref.h", "//base/threading/post_task_and_reply_impl.cc", "//base/threading/post_task_and_reply_impl.h", "//base/threading/scoped_blocking_call.cc", "//base/threading/scoped_blocking_call.h", "//base/threading/scoped_blocking_call_internal.cc", "//base/threading/scoped_blocking_call_internal.h", "//base/threading/scoped_thread_priority.cc", "//base/threading/scoped_thread_priority.h", "//base/threading/sequence_bound.h", "//base/threading/sequence_bound_internal.h", "//base/threading/sequence_local_storage_map.cc", "//base/threading/sequence_local_storage_map.h", "//base/threading/sequence_local_storage_slot.cc", "//base/threading/sequence_local_storage_slot.h", "//base/threading/simple_thread.cc", "//base/threading/simple_thread.h", "//base/threading/thread.cc", "//base/threading/thread.h", "//base/threading/thread_checker.cc", "//base/threading/thread_checker.h", "//base/threading/thread_checker_impl.cc", "//base/threading/thread_checker_impl.h", "//base/threading/thread_collision_warner.cc", "//base/threading/thread_collision_warner.h", "//base/threading/thread_id_name_manager.cc", "//base/threading/thread_id_name_manager.h", "//base/threading/thread_local.h", "//base/threading/thread_local_internal.h", "//base/threading/thread_local_storage.cc", "//base/threading/thread_local_storage.h", "//base/threading/thread_restrictions.cc", "//base/threading/thread_restrictions.h", "//base/threading/threading_features.h", "//base/threading/watchdog.cc", "//base/threading/watchdog.h", "//base/time/clock.cc", "//base/time/clock.h", "//base/time/default_clock.cc", "//base/time/default_clock.h", "//base/time/default_tick_clock.cc", "//base/time/default_tick_clock.h", "//base/time/tick_clock.cc", "//base/time/tick_clock.h", "//base/time/time.cc", "//base/time/time.h", "//base/time/time_delta_from_string.cc", "//base/time/time_delta_from_string.h", "//base/time/time_override.cc", "//base/time/time_override.h", "//base/timer/elapsed_timer.cc", "//base/timer/elapsed_timer.h", "//base/timer/hi_res_timer_manager.h", "//base/timer/lap_timer.cc", "//base/timer/lap_timer.h", "//base/timer/timer.cc", "//base/timer/timer.h", "//base/timer/wall_clock_timer.cc", "//base/timer/wall_clock_timer.h", "//base/token.cc", "//base/token.h", "//base/trace_event/base_tracing.h", "//base/trace_event/base_tracing_forward.h", "//base/trace_event/common/trace_event_common.h", "//base/trace_event/heap_profiler_allocation_context.cc", "//base/trace_event/heap_profiler_allocation_context.h", "//base/trace_event/heap_profiler_allocation_context_tracker.cc", "//base/trace_event/heap_profiler_allocation_context_tracker.h", "//base/trace_event/memory_allocator_dump_guid.cc", "//base/trace_event/memory_allocator_dump_guid.h", "//base/trace_event/trace_id_helper.cc", "//base/trace_event/trace_id_helper.h", "//base/traits_bag.h", "//base/tuple.h", "//base/types/always_false.h", "//base/types/cxx23_to_underlying.h", "//base/types/expected.h", "//base/types/expected_internal.h", "//base/types/expected_macros.h", "//base/types/fixed_array.h", "//base/types/id_type.h", "//base/types/optional_ref.h", "//base/types/optional_util.h", "//base/types/pass_key.h", "//base/types/strong_alias.h", "//base/types/supports_ostream_operator.h", "//base/types/token_type.h", "//base/types/variant_util.h", "//base/unguessable_token.cc", "//base/unguessable_token.h", "//base/uuid.cc", "//base/uuid.h", "//base/value_iterators.cc", "//base/value_iterators.h", "//base/values.cc", "//base/values.h", "//base/version.cc", "//base/version.h", "//base/vlog.cc", "//base/vlog.h", "//base/debug/debugger_posix.cc", "//base/file_descriptor_posix.cc", "//base/file_descriptor_posix.h", "//base/files/dir_reader_posix.h", "//base/files/file_posix.cc", "//base/files/memory_mapped_file_posix.cc", "//base/message_loop/watchable_io_message_pump_posix.cc", "//base/message_loop/watchable_io_message_pump_posix.h", "//base/posix/eintr_wrapper.h", "//base/posix/file_descriptor_shuffle.cc", "//base/posix/file_descriptor_shuffle.h", "//base/posix/global_descriptors.cc", "//base/posix/global_descriptors.h", "//base/posix/safe_strerror.cc", "//base/posix/safe_strerror.h", "//base/process/process_handle_posix.cc", "//base/strings/string_util_posix.h", "//base/synchronization/condition_variable_posix.cc", "//base/synchronization/lock_impl_posix.cc", "//base/threading/platform_thread_posix.cc", "//base/threading/thread_local_storage_posix.cc", "//base/time/time_conversion_posix.cc", "//base/timer/hi_res_timer_manager_posix.cc", "//base/files/file_path_watcher_inotify.cc", "//base/files/file_path_watcher_inotify.h", "//base/android/android_hardware_buffer_compat.cc", "//base/android/android_hardware_buffer_compat.h", "//base/android/android_image_reader_abi.h", "//base/android/android_image_reader_compat.cc", "//base/android/android_image_reader_compat.h", "//base/android/apk_assets.cc", "//base/android/apk_assets.h", "//base/android/application_status_listener.cc", "//base/android/application_status_listener.h", "//base/android/base_feature_map.cc", "//base/android/base_features.cc", "//base/android/base_features.h", "//base/android/build_info.cc", "//base/android/build_info.h", "//base/android/bundle_utils.cc", "//base/android/bundle_utils.h", "//base/android/child_process_binding_types.h", "//base/android/child_process_service.cc", "//base/android/content_uri_utils.cc", "//base/android/content_uri_utils.h", "//base/android/cpu_features.cc", "//base/android/early_trace_event_binding.cc", "//base/android/early_trace_event_binding.h", "//base/android/event_log.cc", "//base/android/event_log.h", "//base/android/feature_list_jni.cc", "//base/android/feature_map.cc", "//base/android/feature_map.h", "//base/android/features_jni.cc", "//base/android/field_trial_list.cc", "//base/android/important_file_writer_android.cc", "//base/android/int_string_callback.cc", "//base/android/int_string_callback.h", "//base/android/jank_metric_uma_recorder.cc", "//base/android/jank_metric_uma_recorder.h", "//base/android/java_handler_thread.cc", "//base/android/java_handler_thread.h", "//base/android/java_heap_dump_generator.cc", "//base/android/java_heap_dump_generator.h", "//base/android/java_runtime.cc", "//base/android/java_runtime.h", "//base/android/library_loader/anchor_functions.cc", "//base/android/library_loader/anchor_functions.h", "//base/android/library_loader/library_prefetcher.cc", "//base/android/library_loader/library_prefetcher.h", "//base/android/library_loader/library_prefetcher_hooks.cc", "//base/android/locale_utils.cc", "//base/android/locale_utils.h", "//base/android/meminfo_dump_provider.cc", "//base/android/meminfo_dump_provider.h", "//base/android/memory_pressure_listener_android.cc", "//base/android/memory_pressure_listener_android.h", "//base/android/path_service_android.cc", "//base/android/path_utils.cc", "//base/android/path_utils.h", "//base/android/radio_utils.cc", "//base/android/radio_utils.h", "//base/android/reached_addresses_bitset.cc", "//base/android/reached_addresses_bitset.h", "//base/android/reached_code_profiler.cc", "//base/android/reached_code_profiler.h", "//base/android/scoped_hardware_buffer_fence_sync.cc", "//base/android/scoped_hardware_buffer_fence_sync.h", "//base/android/scoped_hardware_buffer_handle.cc", "//base/android/scoped_hardware_buffer_handle.h", "//base/android/shared_preferences/shared_preferences_manager.cc", "//base/android/shared_preferences/shared_preferences_manager.h", "//base/android/statistics_recorder_android.cc", "//base/android/sys_utils.cc", "//base/android/sys_utils.h", "//base/android/task_scheduler/post_task_android.cc", "//base/android/task_scheduler/post_task_android.h", "//base/android/task_scheduler/task_runner_android.cc", "//base/android/task_scheduler/task_runner_android.h", "//base/android/task_scheduler/task_traits_android.h", "//base/android/thread_instruction_count.cc", "//base/android/thread_instruction_count.h", "//base/android/timezone_utils.cc", "//base/android/timezone_utils.h", "//base/android/unguessable_token_android.cc", "//base/android/unguessable_token_android.h", "//base/debug/stack_trace_android.cc", "//base/files/file_util_android.cc", "//base/files/scoped_file_android.cc", "//base/memory/platform_shared_memory_mapper_android.cc", "//base/memory/platform_shared_memory_region_android.cc", "//base/message_loop/message_pump_android.cc", "//base/message_loop/message_pump_android.h", "//base/os_compat_android.cc", "//base/os_compat_android.h", "//base/process/process_android.cc", "//base/profiler/native_unwinder_android_map_delegate.h", "//base/profiler/native_unwinder_android_memory_regions_map.h", "//base/profiler/stack_sampler_android.cc", "//base/system/sys_info_android.cc", "//base/threading/platform_thread_android.cc", "//base/debug/elf_reader.cc", "//base/debug/elf_reader.h", "//base/debug/proc_maps_linux.cc", "//base/debug/proc_maps_linux.h", "//base/power_monitor/power_monitor_device_source_android.cc", "//base/process/internal_linux.cc", "//base/process/internal_linux.h", "//base/process/memory_linux.cc", "//base/process/process_handle_linux.cc", "//base/process/process_iterator_linux.cc", "//base/process/process_metrics_linux.cc", "//base/system/sys_info_linux.cc", "//base/trace_event/cfi_backtrace_android.cc", "//base/trace_event/cfi_backtrace_android.h", "//base/profiler/chrome_unwind_info_android.cc", "//base/profiler/chrome_unwind_info_android.h", "//base/profiler/chrome_unwinder_android.cc", "//base/profiler/chrome_unwinder_android.h", "//base/android/base_jni_onload.cc", "//base/android/base_jni_onload.h", "//base/android/callback_android.cc", "//base/android/callback_android.h", "//base/android/command_line_android.cc", "//base/android/java_exception_reporter.cc", "//base/android/java_exception_reporter.h", "//base/android/jni_android.cc", "//base/android/jni_android.h", "//base/android/jni_array.cc", "//base/android/jni_array.h", "//base/android/jni_registrar.cc", "//base/android/jni_registrar.h", "//base/android/jni_string.cc", "//base/android/jni_string.h", "//base/android/jni_utils.cc", "//base/android/jni_utils.h", "//base/android/jni_weak_ref.cc", "//base/android/jni_weak_ref.h", "//base/android/library_loader/library_loader_hooks.cc", "//base/android/library_loader/library_loader_hooks.h", "//base/android/native_uma_recorder.cc", "//base/android/scoped_java_ref.cc", "//base/android/scoped_java_ref.h", "//base/android/trace_event_binding.cc", "//base/android/trace_event_binding.h", "//base/hash/md5.h", "//base/hash/md5_constexpr.h", "//base/hash/md5_constexpr_internal.h", "//base/hash/sha1.h", "//base/hash/md5_boringssl.cc", "//base/hash/md5_boringssl.h", "//base/hash/sha1_boringssl.cc", "//base/hash/sha1_boringssl.h", "//base/base_paths.cc", "//base/base_paths.h", "//base/cpu.cc", "//base/cpu.h", "//base/debug/crash_logging.cc", "//base/debug/crash_logging.h", "//base/debug/stack_trace.cc", "//base/debug/stack_trace.h", "//base/files/file_enumerator.cc", "//base/files/file_enumerator.h", "//base/files/file_proxy.cc", "//base/files/file_proxy.h", "//base/files/file_util.cc", "//base/files/file_util.h", "//base/files/important_file_writer.cc", "//base/files/important_file_writer.h", "//base/files/important_file_writer_cleaner.cc", "//base/files/important_file_writer_cleaner.h", "//base/files/scoped_temp_dir.cc", "//base/files/scoped_temp_dir.h", "//base/files/scoped_temp_file.cc", "//base/files/scoped_temp_file.h", "//base/json/json_file_value_serializer.cc", "//base/json/json_file_value_serializer.h", "//base/memory/discardable_memory.cc", "//base/memory/discardable_memory.h", "//base/memory/discardable_memory_allocator.cc", "//base/memory/discardable_memory_allocator.h", "//base/memory/discardable_memory_internal.h", "//base/metrics/persistent_histogram_storage.cc", "//base/metrics/persistent_histogram_storage.h", "//base/native_library.cc", "//base/native_library.h", "//base/path_service.cc", "//base/path_service.h", "//base/process/process_metrics.cc", "//base/process/process_metrics.h", "//base/scoped_native_library.cc", "//base/scoped_native_library.h", "//base/system/sys_info.cc", "//base/system/sys_info.h", "//base/system/sys_info_internal.h", "//base/task/thread_pool/initialization_util.cc", "//base/task/thread_pool/initialization_util.h", "//base/base_paths_android.cc", "//base/base_paths_android.h", "//base/task/thread_pool/semaphore/semaphore_posix.cc", "//base/base_paths_posix.h", "//base/memory/madv_free_discardable_memory_allocator_posix.cc", "//base/memory/madv_free_discardable_memory_allocator_posix.h", "//base/memory/madv_free_discardable_memory_posix.cc", "//base/memory/madv_free_discardable_memory_posix.h", "//base/posix/unix_domain_socket.cc", "//base/posix/unix_domain_socket.h", "//base/rand_util_posix.cc", "//base/system/sys_info_posix.cc", "//base/files/file_descriptor_watcher_posix.cc", "//base/files/file_descriptor_watcher_posix.h", "//base/files/file_enumerator_posix.cc", "//base/files/file_util_posix.cc", "//base/memory/page_size_posix.cc", "//base/process/process_metrics_posix.cc", "//base/sync_socket_posix.cc", "//base/native_library_posix.cc", "//base/posix/can_lower_nice_to.cc", "//base/posix/can_lower_nice_to.h", "//base/process/launch_posix.cc", "//base/profiler/module_cache_posix.cc", "//base/profiler/stack_base_address_posix.cc", "//base/profiler/stack_base_address_posix.h", "//base/profiler/stack_copier_signal.cc", "//base/profiler/stack_copier_signal.h", "//base/profiler/thread_delegate_posix.cc", "//base/profiler/thread_delegate_posix.h", "//base/process/process_posix.cc", "//base/memory/discardable_shared_memory.cc", "//base/memory/discardable_shared_memory.h", "//base/process/kill.cc", "//base/process/kill.h", "//base/process/launch.cc", "//base/process/launch.h", "//base/process/memory.cc", "//base/process/memory.h", "//base/process/process_iterator.cc", "//base/process/process_iterator.h", "//base/process/kill_posix.cc", "//base/file_descriptor_store.cc", "//base/file_descriptor_store.h", "//base/files/file_path_watcher.cc", "//base/files/file_path_watcher.h", "//base/sync_socket.cc", "//base/sync_socket.h", "//base/message_loop/message_pump_libevent.cc", "//base/message_loop/message_pump_libevent.h", "//base/message_loop/message_pump_epoll.cc", "//base/message_loop/message_pump_epoll.h", "//base/strings/sys_string_conversions_posix.cc", "//base/synchronization/waitable_event_posix.cc", "//base/synchronization/waitable_event_watcher_posix.cc", "//base/threading/platform_thread_internal_posix.cc", "//base/threading/platform_thread_internal_posix.h", "//base/time/time_exploded_posix.cc", "//base/time/time_now_posix.cc", "//base/time/time_exploded_icu.cc", "//base/time/time_android.cc", "//base/trace_event/trace_event_stub.cc", "//base/trace_event/trace_event_stub.h" ],
+      "sources": [ "//base/allocator/allocator_check.cc", "//base/allocator/allocator_check.h", "//base/allocator/allocator_extension.cc", "//base/allocator/allocator_extension.h", "//base/allocator/dispatcher/configuration.h", "//base/allocator/dispatcher/dispatcher.cc", "//base/allocator/dispatcher/dispatcher.h", "//base/allocator/dispatcher/initializer.h", "//base/allocator/dispatcher/internal/dispatch_data.cc", "//base/allocator/dispatcher/internal/dispatch_data.h", "//base/allocator/dispatcher/internal/dispatcher_internal.h", "//base/allocator/dispatcher/internal/tools.h", "//base/allocator/dispatcher/reentry_guard.cc", "//base/allocator/dispatcher/reentry_guard.h", "//base/allocator/dispatcher/subsystem.h", "//base/allocator/dispatcher/tls.cc", "//base/allocator/dispatcher/tls.h", "//base/at_exit.cc", "//base/at_exit.h", "//base/atomic_ref_count.h", "//base/atomic_sequence_num.h", "//base/atomicops.h", "//base/atomicops_internals_atomicword_compat.h", "//base/atomicops_internals_portable.h", "//base/auto_reset.h", "//base/barrier_callback.h", "//base/barrier_closure.cc", "//base/barrier_closure.h", "//base/base64.cc", "//base/base64.h", "//base/base64url.cc", "//base/base64url.h", "//base/base_switches.h", "//base/big_endian.cc", "//base/big_endian.h", "//base/bit_cast.h", "//base/bits.h", "//base/build_time.h", "//base/callback_list.cc", "//base/callback_list.h", "//base/cancelable_callback.h", "//base/check.cc", "//base/check.h", "//base/check_deref.h", "//base/check_is_test.cc", "//base/check_is_test.h", "//base/check_op.cc", "//base/check_op.h", "//base/command_line.cc", "//base/command_line.h", "//base/compiler_specific.h", "//base/component_export.h", "//base/containers/adapters.h", "//base/containers/buffer_iterator.h", "//base/containers/checked_iterators.h", "//base/containers/circular_deque.h", "//base/containers/contains.h", "//base/containers/cxx20_erase.h", "//base/containers/cxx20_erase_internal.h", "//base/containers/cxx20_erase_map.h", "//base/containers/cxx20_erase_vector.h", "//base/containers/enum_set.h", "//base/containers/extend.h", "//base/containers/fixed_flat_map.h", "//base/containers/fixed_flat_set.h", "//base/containers/flat_map.h", "//base/containers/flat_set.h", "//base/containers/flat_tree.h", "//base/containers/id_map.h", "//base/containers/intrusive_heap.cc", "//base/containers/intrusive_heap.h", "//base/containers/linked_list.cc", "//base/containers/linked_list.h", "//base/containers/lru_cache.h", "//base/containers/map_util.h", "//base/containers/small_map.h", "//base/containers/span.h", "//base/containers/stack.h", "//base/containers/unique_ptr_adapters.h", "//base/containers/util.h", "//base/containers/vector_buffer.h", "//base/cpu_reduction_experiment.cc", "//base/cpu_reduction_experiment.h", "//base/critical_closure.h", "//base/dcheck_is_on.h", "//base/debug/alias.cc", "//base/debug/alias.h", "//base/debug/asan_invalid_access.cc", "//base/debug/asan_invalid_access.h", "//base/debug/asan_service.cc", "//base/debug/asan_service.h", "//base/debug/buffered_dwarf_reader.cc", "//base/debug/buffered_dwarf_reader.h", "//base/debug/debugger.cc", "//base/debug/debugger.h", "//base/debug/dump_without_crashing.cc", "//base/debug/dump_without_crashing.h", "//base/debug/dwarf_line_no.cc", "//base/debug/dwarf_line_no.h", "//base/debug/leak_annotations.h", "//base/debug/profiler.cc", "//base/debug/profiler.h", "//base/debug/task_trace.cc", "//base/debug/task_trace.h", "//base/environment.cc", "//base/environment.h", "//base/export_template.h", "//base/feature_list.cc", "//base/feature_list.h", "//base/features.cc", "//base/features.h", "//base/file_version_info.h", "//base/files/block_tests_writing_to_special_dirs.cc", "//base/files/block_tests_writing_to_special_dirs.h", "//base/files/dir_reader_fallback.h", "//base/files/file.cc", "//base/files/file.h", "//base/files/file_error_or.h", "//base/files/file_path.cc", "//base/files/file_path.h", "//base/files/file_tracing.cc", "//base/files/file_tracing.h", "//base/files/memory_mapped_file.cc", "//base/files/memory_mapped_file.h", "//base/files/platform_file.h", "//base/files/safe_base_name.cc", "//base/files/safe_base_name.h", "//base/files/scoped_file.cc", "//base/files/scoped_file.h", "//base/format_macros.h", "//base/functional/bind.h", "//base/functional/bind_internal.h", "//base/functional/callback.h", "//base/functional/callback_forward.h", "//base/functional/callback_helpers.cc", "//base/functional/callback_helpers.h", "//base/functional/callback_internal.cc", "//base/functional/callback_internal.h", "//base/functional/callback_tags.h", "//base/functional/disallow_unretained.h", "//base/functional/function_ref.h", "//base/functional/not_fn.h", "//base/functional/overloaded.h", "//base/functional/unretained_traits.h", "//base/gtest_prod_util.h", "//base/hash/hash.cc", "//base/hash/hash.h", "//base/hash/legacy_hash.cc", "//base/hash/legacy_hash.h", "//base/json/json_common.h", "//base/json/json_parser.cc", "//base/json/json_parser.h", "//base/json/json_reader.cc", "//base/json/json_reader.h", "//base/json/json_string_value_serializer.cc", "//base/json/json_string_value_serializer.h", "//base/json/json_value_converter.cc", "//base/json/json_value_converter.h", "//base/json/json_writer.cc", "//base/json/json_writer.h", "//base/json/string_escape.cc", "//base/json/string_escape.h", "//base/json/values_util.cc", "//base/json/values_util.h", "//base/lazy_instance.h", "//base/lazy_instance_helpers.cc", "//base/lazy_instance_helpers.h", "//base/linux_util.cc", "//base/linux_util.h", "//base/location.cc", "//base/location.h", "//base/logging.cc", "//base/logging.h", "//base/macros/concat.h", "//base/macros/if.h", "//base/macros/remove_parens.h", "//base/macros/uniquify.h", "//base/memory/aligned_memory.cc", "//base/memory/aligned_memory.h", "//base/memory/free_deleter.h", "//base/memory/memory_pressure_listener.cc", "//base/memory/memory_pressure_listener.h", "//base/memory/memory_pressure_monitor.cc", "//base/memory/memory_pressure_monitor.h", "//base/memory/nonscannable_memory.cc", "//base/memory/nonscannable_memory.h", "//base/memory/page_size.h", "//base/memory/platform_shared_memory_handle.cc", "//base/memory/platform_shared_memory_handle.h", "//base/memory/platform_shared_memory_mapper.h", "//base/memory/platform_shared_memory_region.cc", "//base/memory/platform_shared_memory_region.h", "//base/memory/ptr_util.h", "//base/memory/raw_ptr.h", "//base/memory/raw_ptr_asan_bound_arg_tracker.cc", "//base/memory/raw_ptr_asan_bound_arg_tracker.h", "//base/memory/raw_ptr_asan_hooks.cc", "//base/memory/raw_ptr_asan_hooks.h", "//base/memory/raw_ptr_asan_service.cc", "//base/memory/raw_ptr_asan_service.h", "//base/memory/raw_ptr_cast.h", "//base/memory/raw_ptr_exclusion.h", "//base/memory/raw_ref.h", "//base/memory/raw_scoped_refptr_mismatch_checker.h", "//base/memory/raw_span.h", "//base/memory/read_only_shared_memory_region.cc", "//base/memory/read_only_shared_memory_region.h", "//base/memory/ref_counted.cc", "//base/memory/ref_counted.h", "//base/memory/ref_counted_delete_on_sequence.h", "//base/memory/ref_counted_memory.cc", "//base/memory/ref_counted_memory.h", "//base/memory/safe_ref.h", "//base/memory/safe_ref_traits.h", "//base/memory/safety_checks.h", "//base/memory/scoped_policy.h", "//base/memory/scoped_refptr.h", "//base/memory/shared_memory_hooks.h", "//base/memory/shared_memory_mapper.cc", "//base/memory/shared_memory_mapper.h", "//base/memory/shared_memory_mapping.cc", "//base/memory/shared_memory_mapping.h", "//base/memory/shared_memory_security_policy.cc", "//base/memory/shared_memory_security_policy.h", "//base/memory/shared_memory_tracker.cc", "//base/memory/shared_memory_tracker.h", "//base/memory/singleton.h", "//base/memory/stack_allocated.h", "//base/memory/unsafe_shared_memory_pool.cc", "//base/memory/unsafe_shared_memory_pool.h", "//base/memory/unsafe_shared_memory_region.cc", "//base/memory/unsafe_shared_memory_region.h", "//base/memory/values_equivalent.h", "//base/memory/weak_auto_reset.h", "//base/memory/weak_ptr.cc", "//base/memory/weak_ptr.h", "//base/memory/writable_shared_memory_region.cc", "//base/memory/writable_shared_memory_region.h", "//base/message_loop/message_pump.cc", "//base/message_loop/message_pump.h", "//base/message_loop/message_pump_default.cc", "//base/message_loop/message_pump_default.h", "//base/message_loop/message_pump_for_io.h", "//base/message_loop/message_pump_for_ui.h", "//base/message_loop/message_pump_type.h", "//base/message_loop/work_id_provider.cc", "//base/message_loop/work_id_provider.h", "//base/metrics/bucket_ranges.cc", "//base/metrics/bucket_ranges.h", "//base/metrics/crc32.cc", "//base/metrics/crc32.h", "//base/metrics/dummy_histogram.cc", "//base/metrics/dummy_histogram.h", "//base/metrics/field_trial.cc", "//base/metrics/field_trial.h", "//base/metrics/field_trial_list_including_low_anonymity.cc", "//base/metrics/field_trial_list_including_low_anonymity.h", "//base/metrics/field_trial_param_associator.cc", "//base/metrics/field_trial_param_associator.h", "//base/metrics/field_trial_params.cc", "//base/metrics/field_trial_params.h", "//base/metrics/histogram.cc", "//base/metrics/histogram.h", "//base/metrics/histogram_base.cc", "//base/metrics/histogram_base.h", "//base/metrics/histogram_delta_serialization.cc", "//base/metrics/histogram_delta_serialization.h", "//base/metrics/histogram_flattener.h", "//base/metrics/histogram_functions.cc", "//base/metrics/histogram_functions.h", "//base/metrics/histogram_macros.h", "//base/metrics/histogram_macros_internal.h", "//base/metrics/histogram_macros_local.h", "//base/metrics/histogram_samples.cc", "//base/metrics/histogram_samples.h", "//base/metrics/histogram_shared_memory.cc", "//base/metrics/histogram_shared_memory.h", "//base/metrics/histogram_snapshot_manager.cc", "//base/metrics/histogram_snapshot_manager.h", "//base/metrics/metrics_hashes.cc", "//base/metrics/metrics_hashes.h", "//base/metrics/persistent_histogram_allocator.cc", "//base/metrics/persistent_histogram_allocator.h", "//base/metrics/persistent_memory_allocator.cc", "//base/metrics/persistent_memory_allocator.h", "//base/metrics/persistent_sample_map.cc", "//base/metrics/persistent_sample_map.h", "//base/metrics/ranges_manager.cc", "//base/metrics/ranges_manager.h", "//base/metrics/record_histogram_checker.h", "//base/metrics/sample_map.cc", "//base/metrics/sample_map.h", "//base/metrics/sample_vector.cc", "//base/metrics/sample_vector.h", "//base/metrics/single_sample_metrics.cc", "//base/metrics/single_sample_metrics.h", "//base/metrics/sparse_histogram.cc", "//base/metrics/sparse_histogram.h", "//base/metrics/statistics_recorder.cc", "//base/metrics/statistics_recorder.h", "//base/metrics/user_metrics.cc", "//base/metrics/user_metrics.h", "//base/metrics/user_metrics_action.h", "//base/no_destructor.h", "//base/notreached.h", "//base/observer_list.h", "//base/observer_list_internal.cc", "//base/observer_list_internal.h", "//base/observer_list_threadsafe.cc", "//base/observer_list_threadsafe.h", "//base/observer_list_types.cc", "//base/observer_list_types.h", "//base/one_shot_event.cc", "//base/one_shot_event.h", "//base/parameter_pack.h", "//base/pending_task.cc", "//base/pending_task.h", "//base/pickle.cc", "//base/pickle.h", "//base/power_monitor/battery_level_provider.cc", "//base/power_monitor/battery_level_provider.h", "//base/power_monitor/battery_state_sampler.cc", "//base/power_monitor/battery_state_sampler.h", "//base/power_monitor/power_monitor.cc", "//base/power_monitor/power_monitor.h", "//base/power_monitor/power_monitor_device_source.cc", "//base/power_monitor/power_monitor_device_source.h", "//base/power_monitor/power_monitor_features.cc", "//base/power_monitor/power_monitor_features.h", "//base/power_monitor/power_monitor_source.cc", "//base/power_monitor/power_monitor_source.h", "//base/power_monitor/power_observer.h", "//base/power_monitor/sampling_event_source.cc", "//base/power_monitor/sampling_event_source.h", "//base/power_monitor/timer_sampling_event_source.cc", "//base/power_monitor/timer_sampling_event_source.h", "//base/process/current_process.cc", "//base/process/current_process.h", "//base/process/current_process_test.h", "//base/process/environment_internal.cc", "//base/process/environment_internal.h", "//base/process/process.h", "//base/process/process_handle.cc", "//base/process/process_handle.h", "//base/process/process_info.h", "//base/process/process_metrics_iocounters.h", "//base/profiler/frame.cc", "//base/profiler/frame.h", "//base/profiler/metadata_recorder.cc", "//base/profiler/metadata_recorder.h", "//base/profiler/module_cache.cc", "//base/profiler/module_cache.h", "//base/profiler/profile_builder.h", "//base/profiler/register_context.h", "//base/profiler/sample_metadata.cc", "//base/profiler/sample_metadata.h", "//base/profiler/sampling_profiler_thread_token.cc", "//base/profiler/sampling_profiler_thread_token.h", "//base/profiler/stack_buffer.cc", "//base/profiler/stack_buffer.h", "//base/profiler/stack_copier.cc", "//base/profiler/stack_copier.h", "//base/profiler/stack_copier_suspend.cc", "//base/profiler/stack_copier_suspend.h", "//base/profiler/stack_sampler.cc", "//base/profiler/stack_sampler.h", "//base/profiler/stack_sampling_profiler.cc", "//base/profiler/stack_sampling_profiler.h", "//base/profiler/suspendable_thread_delegate.h", "//base/profiler/thread_delegate.h", "//base/profiler/unwinder.cc", "//base/profiler/unwinder.h", "//base/rand_util.cc", "//base/rand_util.h", "//base/ranges/algorithm.h", "//base/ranges/functional.h", "//base/ranges/ranges.h", "//base/run_loop.cc", "//base/run_loop.h", "//base/sampling_heap_profiler/lock_free_address_hash_set.cc", "//base/sampling_heap_profiler/lock_free_address_hash_set.h", "//base/sampling_heap_profiler/poisson_allocation_sampler.cc", "//base/sampling_heap_profiler/poisson_allocation_sampler.h", "//base/sampling_heap_profiler/sampling_heap_profiler.cc", "//base/sampling_heap_profiler/sampling_heap_profiler.h", "//base/scoped_add_feature_flags.cc", "//base/scoped_add_feature_flags.h", "//base/scoped_clear_last_error.h", "//base/scoped_environment_variable_override.cc", "//base/scoped_environment_variable_override.h", "//base/scoped_generic.h", "//base/scoped_multi_source_observation.h", "//base/scoped_observation.h", "//base/scoped_observation_traits.h", "//base/sequence_checker.cc", "//base/sequence_checker.h", "//base/sequence_checker_impl.cc", "//base/sequence_checker_impl.h", "//base/sequence_token.cc", "//base/sequence_token.h", "//base/state_transitions.h", "//base/stl_util.h", "//base/strings/abseil_string_number_conversions.cc", "//base/strings/abseil_string_number_conversions.h", "//base/strings/escape.cc", "//base/strings/escape.h", "//base/strings/latin1_string_conversions.cc", "//base/strings/latin1_string_conversions.h", "//base/strings/levenshtein_distance.cc", "//base/strings/levenshtein_distance.h", "//base/strings/pattern.cc", "//base/strings/pattern.h", "//base/strings/safe_sprintf.cc", "//base/strings/safe_sprintf.h", "//base/strings/strcat.cc", "//base/strings/strcat.h", "//base/strings/strcat_internal.h", "//base/strings/string_number_conversions.cc", "//base/strings/string_number_conversions.h", "//base/strings/string_number_conversions_internal.h", "//base/strings/string_piece.h", "//base/strings/string_split.cc", "//base/strings/string_split.h", "//base/strings/string_split_internal.h", "//base/strings/string_tokenizer.h", "//base/strings/string_util.cc", "//base/strings/string_util.h", "//base/strings/string_util_constants.cc", "//base/strings/string_util_impl_helpers.h", "//base/strings/string_util_internal.h", "//base/strings/stringize_macros.h", "//base/strings/stringprintf.cc", "//base/strings/stringprintf.h", "//base/strings/sys_string_conversions.h", "//base/strings/to_string.h", "//base/strings/utf_offset_string_conversions.cc", "//base/strings/utf_offset_string_conversions.h", "//base/strings/utf_ostream_operators.cc", "//base/strings/utf_ostream_operators.h", "//base/strings/utf_string_conversion_utils.cc", "//base/strings/utf_string_conversion_utils.h", "//base/strings/utf_string_conversions.cc", "//base/strings/utf_string_conversions.h", "//base/substring_set_matcher/matcher_string_pattern.cc", "//base/substring_set_matcher/matcher_string_pattern.h", "//base/substring_set_matcher/substring_set_matcher.cc", "//base/substring_set_matcher/substring_set_matcher.h", "//base/supports_user_data.cc", "//base/supports_user_data.h", "//base/synchronization/atomic_flag.cc", "//base/synchronization/atomic_flag.h", "//base/synchronization/condition_variable.h", "//base/synchronization/lock.cc", "//base/synchronization/lock.h", "//base/synchronization/lock_impl.h", "//base/synchronization/waitable_event.cc", "//base/synchronization/waitable_event.h", "//base/synchronization/waitable_event_watcher.h", "//base/sys_byteorder.h", "//base/syslog_logging.cc", "//base/syslog_logging.h", "//base/system/system_monitor.cc", "//base/system/system_monitor.h", "//base/task/bind_post_task.h", "//base/task/bind_post_task_internal.h", "//base/task/cancelable_task_tracker.cc", "//base/task/cancelable_task_tracker.h", "//base/task/common/checked_lock.h", "//base/task/common/checked_lock_impl.cc", "//base/task/common/checked_lock_impl.h", "//base/task/common/lazy_now.cc", "//base/task/common/lazy_now.h", "//base/task/common/operations_controller.cc", "//base/task/common/operations_controller.h", "//base/task/common/scoped_defer_task_posting.cc", "//base/task/common/scoped_defer_task_posting.h", "//base/task/common/task_annotator.cc", "//base/task/common/task_annotator.h", "//base/task/current_thread.cc", "//base/task/current_thread.h", "//base/task/default_delayed_task_handle_delegate.cc", "//base/task/default_delayed_task_handle_delegate.h", "//base/task/deferred_sequenced_task_runner.cc", "//base/task/deferred_sequenced_task_runner.h", "//base/task/delay_policy.h", "//base/task/delayed_task_handle.cc", "//base/task/delayed_task_handle.h", "//base/task/lazy_thread_pool_task_runner.cc", "//base/task/lazy_thread_pool_task_runner.h", "//base/task/post_job.cc", "//base/task/post_job.h", "//base/task/post_task_and_reply_with_result_internal.h", "//base/task/scoped_set_task_priority_for_current_thread.cc", "//base/task/scoped_set_task_priority_for_current_thread.h", "//base/task/sequence_manager/associated_thread_id.cc", "//base/task/sequence_manager/associated_thread_id.h", "//base/task/sequence_manager/atomic_flag_set.cc", "//base/task/sequence_manager/atomic_flag_set.h", "//base/task/sequence_manager/delayed_task_handle_delegate.cc", "//base/task/sequence_manager/delayed_task_handle_delegate.h", "//base/task/sequence_manager/enqueue_order.h", "//base/task/sequence_manager/enqueue_order_generator.cc", "//base/task/sequence_manager/enqueue_order_generator.h", "//base/task/sequence_manager/fence.cc", "//base/task/sequence_manager/fence.h", "//base/task/sequence_manager/lazily_deallocated_deque.h", "//base/task/sequence_manager/sequence_manager.cc", "//base/task/sequence_manager/sequence_manager.h", "//base/task/sequence_manager/sequence_manager_impl.cc", "//base/task/sequence_manager/sequence_manager_impl.h", "//base/task/sequence_manager/sequenced_task_source.cc", "//base/task/sequence_manager/sequenced_task_source.h", "//base/task/sequence_manager/task_order.cc", "//base/task/sequence_manager/task_order.h", "//base/task/sequence_manager/task_queue.cc", "//base/task/sequence_manager/task_queue.h", "//base/task/sequence_manager/task_queue_impl.cc", "//base/task/sequence_manager/task_queue_impl.h", "//base/task/sequence_manager/task_queue_selector.cc", "//base/task/sequence_manager/task_queue_selector.h", "//base/task/sequence_manager/task_time_observer.h", "//base/task/sequence_manager/tasks.cc", "//base/task/sequence_manager/tasks.h", "//base/task/sequence_manager/thread_controller.cc", "//base/task/sequence_manager/thread_controller.h", "//base/task/sequence_manager/thread_controller_impl.cc", "//base/task/sequence_manager/thread_controller_impl.h", "//base/task/sequence_manager/thread_controller_power_monitor.cc", "//base/task/sequence_manager/thread_controller_power_monitor.h", "//base/task/sequence_manager/thread_controller_with_message_pump_impl.cc", "//base/task/sequence_manager/thread_controller_with_message_pump_impl.h", "//base/task/sequence_manager/time_domain.cc", "//base/task/sequence_manager/time_domain.h", "//base/task/sequence_manager/wake_up_queue.cc", "//base/task/sequence_manager/wake_up_queue.h", "//base/task/sequence_manager/work_deduplicator.cc", "//base/task/sequence_manager/work_deduplicator.h", "//base/task/sequence_manager/work_queue.cc", "//base/task/sequence_manager/work_queue.h", "//base/task/sequence_manager/work_queue_sets.cc", "//base/task/sequence_manager/work_queue_sets.h", "//base/task/sequenced_task_runner.cc", "//base/task/sequenced_task_runner.h", "//base/task/sequenced_task_runner_helpers.h", "//base/task/single_thread_task_executor.cc", "//base/task/single_thread_task_executor.h", "//base/task/single_thread_task_runner.cc", "//base/task/single_thread_task_runner.h", "//base/task/single_thread_task_runner_thread_mode.h", "//base/task/task_features.cc", "//base/task/task_features.h", "//base/task/task_observer.h", "//base/task/task_runner.cc", "//base/task/task_runner.h", "//base/task/task_traits.cc", "//base/task/task_traits.h", "//base/task/thread_pool.cc", "//base/task/thread_pool.h", "//base/task/thread_pool/delayed_priority_queue.cc", "//base/task/thread_pool/delayed_priority_queue.h", "//base/task/thread_pool/delayed_task_manager.cc", "//base/task/thread_pool/delayed_task_manager.h", "//base/task/thread_pool/environment_config.cc", "//base/task/thread_pool/environment_config.h", "//base/task/thread_pool/job_task_source.cc", "//base/task/thread_pool/job_task_source.h", "//base/task/thread_pool/job_task_source_interface.h", "//base/task/thread_pool/job_task_source_old.cc", "//base/task/thread_pool/job_task_source_old.h", "//base/task/thread_pool/pooled_parallel_task_runner.cc", "//base/task/thread_pool/pooled_parallel_task_runner.h", "//base/task/thread_pool/pooled_sequenced_task_runner.cc", "//base/task/thread_pool/pooled_sequenced_task_runner.h", "//base/task/thread_pool/pooled_single_thread_task_runner_manager.cc", "//base/task/thread_pool/pooled_single_thread_task_runner_manager.h", "//base/task/thread_pool/pooled_task_runner_delegate.cc", "//base/task/thread_pool/pooled_task_runner_delegate.h", "//base/task/thread_pool/priority_queue.cc", "//base/task/thread_pool/priority_queue.h", "//base/task/thread_pool/semaphore.h", "//base/task/thread_pool/sequence.cc", "//base/task/thread_pool/sequence.h", "//base/task/thread_pool/service_thread.cc", "//base/task/thread_pool/service_thread.h", "//base/task/thread_pool/task.cc", "//base/task/thread_pool/task.h", "//base/task/thread_pool/task_source.cc", "//base/task/thread_pool/task_source.h", "//base/task/thread_pool/task_source_sort_key.cc", "//base/task/thread_pool/task_source_sort_key.h", "//base/task/thread_pool/task_tracker.cc", "//base/task/thread_pool/task_tracker.h", "//base/task/thread_pool/thread_group.cc", "//base/task/thread_pool/thread_group.h", "//base/task/thread_pool/thread_group_impl.cc", "//base/task/thread_pool/thread_group_impl.h", "//base/task/thread_pool/thread_pool_impl.cc", "//base/task/thread_pool/thread_pool_impl.h", "//base/task/thread_pool/thread_pool_instance.cc", "//base/task/thread_pool/thread_pool_instance.h", "//base/task/thread_pool/tracked_ref.h", "//base/task/thread_pool/worker_thread.cc", "//base/task/thread_pool/worker_thread.h", "//base/task/thread_pool/worker_thread_observer.h", "//base/task/thread_pool/worker_thread_set.cc", "//base/task/thread_pool/worker_thread_set.h", "//base/task/thread_pool/worker_thread_waitable_event.cc", "//base/task/thread_pool/worker_thread_waitable_event.h", "//base/task/updateable_sequenced_task_runner.h", "//base/template_util.h", "//base/test/scoped_logging_settings.h", "//base/test/spin_wait.h", "//base/third_party/cityhash/city.cc", "//base/third_party/cityhash/city.h", "//base/third_party/cityhash_v103/src/city_v103.cc", "//base/third_party/cityhash_v103/src/city_v103.h", "//base/third_party/icu/icu_utf.h", "//base/third_party/nspr/prtime.cc", "//base/third_party/nspr/prtime.h", "//base/third_party/superfasthash/superfasthash.c", "//base/thread_annotations.h", "//base/threading/hang_watcher.cc", "//base/threading/hang_watcher.h", "//base/threading/platform_thread.cc", "//base/threading/platform_thread.h", "//base/threading/platform_thread_ref.cc", "//base/threading/platform_thread_ref.h", "//base/threading/post_task_and_reply_impl.cc", "//base/threading/post_task_and_reply_impl.h", "//base/threading/scoped_blocking_call.cc", "//base/threading/scoped_blocking_call.h", "//base/threading/scoped_blocking_call_internal.cc", "//base/threading/scoped_blocking_call_internal.h", "//base/threading/scoped_thread_priority.cc", "//base/threading/scoped_thread_priority.h", "//base/threading/sequence_bound.h", "//base/threading/sequence_bound_internal.h", "//base/threading/sequence_local_storage_map.cc", "//base/threading/sequence_local_storage_map.h", "//base/threading/sequence_local_storage_slot.cc", "//base/threading/sequence_local_storage_slot.h", "//base/threading/simple_thread.cc", "//base/threading/simple_thread.h", "//base/threading/thread.cc", "//base/threading/thread.h", "//base/threading/thread_checker.cc", "//base/threading/thread_checker.h", "//base/threading/thread_checker_impl.cc", "//base/threading/thread_checker_impl.h", "//base/threading/thread_collision_warner.cc", "//base/threading/thread_collision_warner.h", "//base/threading/thread_id_name_manager.cc", "//base/threading/thread_id_name_manager.h", "//base/threading/thread_local.h", "//base/threading/thread_local_internal.h", "//base/threading/thread_local_storage.cc", "//base/threading/thread_local_storage.h", "//base/threading/thread_restrictions.cc", "//base/threading/thread_restrictions.h", "//base/threading/threading_features.h", "//base/threading/watchdog.cc", "//base/threading/watchdog.h", "//base/time/clock.cc", "//base/time/clock.h", "//base/time/default_clock.cc", "//base/time/default_clock.h", "//base/time/default_tick_clock.cc", "//base/time/default_tick_clock.h", "//base/time/tick_clock.cc", "//base/time/tick_clock.h", "//base/time/time.cc", "//base/time/time.h", "//base/time/time_delta_from_string.cc", "//base/time/time_delta_from_string.h", "//base/time/time_override.cc", "//base/time/time_override.h", "//base/timer/elapsed_timer.cc", "//base/timer/elapsed_timer.h", "//base/timer/hi_res_timer_manager.h", "//base/timer/lap_timer.cc", "//base/timer/lap_timer.h", "//base/timer/timer.cc", "//base/timer/timer.h", "//base/timer/wall_clock_timer.cc", "//base/timer/wall_clock_timer.h", "//base/token.cc", "//base/token.h", "//base/trace_event/base_tracing.h", "//base/trace_event/base_tracing_forward.h", "//base/trace_event/common/trace_event_common.h", "//base/trace_event/heap_profiler_allocation_context.cc", "//base/trace_event/heap_profiler_allocation_context.h", "//base/trace_event/heap_profiler_allocation_context_tracker.cc", "//base/trace_event/heap_profiler_allocation_context_tracker.h", "//base/trace_event/memory_allocator_dump_guid.cc", "//base/trace_event/memory_allocator_dump_guid.h", "//base/trace_event/trace_id_helper.cc", "//base/trace_event/trace_id_helper.h", "//base/traits_bag.h", "//base/tuple.h", "//base/types/always_false.h", "//base/types/cxx23_to_underlying.h", "//base/types/expected.h", "//base/types/expected_internal.h", "//base/types/expected_macros.h", "//base/types/fixed_array.h", "//base/types/id_type.h", "//base/types/is_instantiation.h", "//base/types/optional_ref.h", "//base/types/optional_util.h", "//base/types/pass_key.h", "//base/types/strong_alias.h", "//base/types/supports_ostream_operator.h", "//base/types/token_type.h", "//base/types/variant_util.h", "//base/unguessable_token.cc", "//base/unguessable_token.h", "//base/uuid.cc", "//base/uuid.h", "//base/value_iterators.cc", "//base/value_iterators.h", "//base/values.cc", "//base/values.h", "//base/version.cc", "//base/version.h", "//base/vlog.cc", "//base/vlog.h", "//base/debug/debugger_posix.cc", "//base/file_descriptor_posix.cc", "//base/file_descriptor_posix.h", "//base/files/dir_reader_posix.h", "//base/files/file_posix.cc", "//base/files/memory_mapped_file_posix.cc", "//base/message_loop/watchable_io_message_pump_posix.cc", "//base/message_loop/watchable_io_message_pump_posix.h", "//base/posix/eintr_wrapper.h", "//base/posix/file_descriptor_shuffle.cc", "//base/posix/file_descriptor_shuffle.h", "//base/posix/global_descriptors.cc", "//base/posix/global_descriptors.h", "//base/posix/safe_strerror.cc", "//base/posix/safe_strerror.h", "//base/process/process_handle_posix.cc", "//base/strings/string_util_posix.h", "//base/synchronization/condition_variable_posix.cc", "//base/synchronization/lock_impl_posix.cc", "//base/threading/platform_thread_posix.cc", "//base/threading/thread_local_storage_posix.cc", "//base/time/time_conversion_posix.cc", "//base/timer/hi_res_timer_manager_posix.cc", "//base/files/file_path_watcher_inotify.cc", "//base/files/file_path_watcher_inotify.h", "//base/android/android_hardware_buffer_compat.cc", "//base/android/android_hardware_buffer_compat.h", "//base/android/android_image_reader_abi.h", "//base/android/android_image_reader_compat.cc", "//base/android/android_image_reader_compat.h", "//base/android/apk_assets.cc", "//base/android/apk_assets.h", "//base/android/application_status_listener.cc", "//base/android/application_status_listener.h", "//base/android/base_feature_map.cc", "//base/android/base_features.cc", "//base/android/base_features.h", "//base/android/build_info.cc", "//base/android/build_info.h", "//base/android/bundle_utils.cc", "//base/android/bundle_utils.h", "//base/android/child_process_binding_types.h", "//base/android/child_process_service.cc", "//base/android/content_uri_utils.cc", "//base/android/content_uri_utils.h", "//base/android/cpu_features.cc", "//base/android/early_trace_event_binding.cc", "//base/android/early_trace_event_binding.h", "//base/android/event_log.cc", "//base/android/event_log.h", "//base/android/feature_list_jni.cc", "//base/android/feature_map.cc", "//base/android/feature_map.h", "//base/android/features_jni.cc", "//base/android/field_trial_list.cc", "//base/android/important_file_writer_android.cc", "//base/android/int_string_callback.cc", "//base/android/int_string_callback.h", "//base/android/jank_metric_uma_recorder.cc", "//base/android/jank_metric_uma_recorder.h", "//base/android/java_handler_thread.cc", "//base/android/java_handler_thread.h", "//base/android/java_heap_dump_generator.cc", "//base/android/java_heap_dump_generator.h", "//base/android/java_runtime.cc", "//base/android/java_runtime.h", "//base/android/library_loader/anchor_functions.cc", "//base/android/library_loader/anchor_functions.h", "//base/android/library_loader/library_prefetcher.cc", "//base/android/library_loader/library_prefetcher.h", "//base/android/library_loader/library_prefetcher_hooks.cc", "//base/android/locale_utils.cc", "//base/android/locale_utils.h", "//base/android/meminfo_dump_provider.cc", "//base/android/meminfo_dump_provider.h", "//base/android/memory_pressure_listener_android.cc", "//base/android/memory_pressure_listener_android.h", "//base/android/path_service_android.cc", "//base/android/path_utils.cc", "//base/android/path_utils.h", "//base/android/radio_utils.cc", "//base/android/radio_utils.h", "//base/android/reached_addresses_bitset.cc", "//base/android/reached_addresses_bitset.h", "//base/android/reached_code_profiler.cc", "//base/android/reached_code_profiler.h", "//base/android/scoped_hardware_buffer_fence_sync.cc", "//base/android/scoped_hardware_buffer_fence_sync.h", "//base/android/scoped_hardware_buffer_handle.cc", "//base/android/scoped_hardware_buffer_handle.h", "//base/android/shared_preferences/shared_preferences_manager.cc", "//base/android/shared_preferences/shared_preferences_manager.h", "//base/android/statistics_recorder_android.cc", "//base/android/sys_utils.cc", "//base/android/sys_utils.h", "//base/android/task_scheduler/post_task_android.cc", "//base/android/task_scheduler/post_task_android.h", "//base/android/task_scheduler/task_runner_android.cc", "//base/android/task_scheduler/task_runner_android.h", "//base/android/task_scheduler/task_traits_android.h", "//base/android/thread_instruction_count.cc", "//base/android/thread_instruction_count.h", "//base/android/timezone_utils.cc", "//base/android/timezone_utils.h", "//base/android/unguessable_token_android.cc", "//base/android/unguessable_token_android.h", "//base/debug/stack_trace_android.cc", "//base/files/file_util_android.cc", "//base/files/scoped_file_android.cc", "//base/memory/platform_shared_memory_mapper_android.cc", "//base/memory/platform_shared_memory_region_android.cc", "//base/message_loop/message_pump_android.cc", "//base/message_loop/message_pump_android.h", "//base/os_compat_android.cc", "//base/os_compat_android.h", "//base/process/process_android.cc", "//base/profiler/native_unwinder_android_map_delegate.h", "//base/profiler/native_unwinder_android_memory_regions_map.h", "//base/profiler/stack_sampler_android.cc", "//base/system/sys_info_android.cc", "//base/threading/platform_thread_android.cc", "//base/debug/elf_reader.cc", "//base/debug/elf_reader.h", "//base/debug/proc_maps_linux.cc", "//base/debug/proc_maps_linux.h", "//base/power_monitor/power_monitor_device_source_android.cc", "//base/process/internal_linux.cc", "//base/process/internal_linux.h", "//base/process/memory_linux.cc", "//base/process/process_handle_linux.cc", "//base/process/process_iterator_linux.cc", "//base/process/process_metrics_linux.cc", "//base/system/sys_info_linux.cc", "//base/trace_event/cfi_backtrace_android.cc", "//base/trace_event/cfi_backtrace_android.h", "//base/profiler/chrome_unwind_info_android.cc", "//base/profiler/chrome_unwind_info_android.h", "//base/profiler/chrome_unwinder_android.cc", "//base/profiler/chrome_unwinder_android.h", "//base/android/base_jni_onload.cc", "//base/android/base_jni_onload.h", "//base/android/callback_android.cc", "//base/android/callback_android.h", "//base/android/command_line_android.cc", "//base/android/java_exception_reporter.cc", "//base/android/java_exception_reporter.h", "//base/android/jni_android.cc", "//base/android/jni_android.h", "//base/android/jni_array.cc", "//base/android/jni_array.h", "//base/android/jni_registrar.cc", "//base/android/jni_registrar.h", "//base/android/jni_string.cc", "//base/android/jni_string.h", "//base/android/jni_utils.cc", "//base/android/jni_utils.h", "//base/android/jni_weak_ref.cc", "//base/android/jni_weak_ref.h", "//base/android/library_loader/library_loader_hooks.cc", "//base/android/library_loader/library_loader_hooks.h", "//base/android/native_uma_recorder.cc", "//base/android/scoped_java_ref.cc", "//base/android/scoped_java_ref.h", "//base/android/trace_event_binding.cc", "//base/android/trace_event_binding.h", "//base/hash/md5.h", "//base/hash/md5_constexpr.h", "//base/hash/md5_constexpr_internal.h", "//base/hash/sha1.h", "//base/hash/md5_boringssl.cc", "//base/hash/md5_boringssl.h", "//base/hash/sha1_boringssl.cc", "//base/hash/sha1_boringssl.h", "//base/base_paths.cc", "//base/base_paths.h", "//base/cpu.cc", "//base/cpu.h", "//base/debug/crash_logging.cc", "//base/debug/crash_logging.h", "//base/debug/stack_trace.cc", "//base/debug/stack_trace.h", "//base/files/file_enumerator.cc", "//base/files/file_enumerator.h", "//base/files/file_proxy.cc", "//base/files/file_proxy.h", "//base/files/file_util.cc", "//base/files/file_util.h", "//base/files/important_file_writer.cc", "//base/files/important_file_writer.h", "//base/files/important_file_writer_cleaner.cc", "//base/files/important_file_writer_cleaner.h", "//base/files/scoped_temp_dir.cc", "//base/files/scoped_temp_dir.h", "//base/files/scoped_temp_file.cc", "//base/files/scoped_temp_file.h", "//base/json/json_file_value_serializer.cc", "//base/json/json_file_value_serializer.h", "//base/memory/discardable_memory.cc", "//base/memory/discardable_memory.h", "//base/memory/discardable_memory_allocator.cc", "//base/memory/discardable_memory_allocator.h", "//base/memory/discardable_memory_internal.h", "//base/metrics/persistent_histogram_storage.cc", "//base/metrics/persistent_histogram_storage.h", "//base/native_library.cc", "//base/native_library.h", "//base/path_service.cc", "//base/path_service.h", "//base/process/process_metrics.cc", "//base/process/process_metrics.h", "//base/scoped_native_library.cc", "//base/scoped_native_library.h", "//base/system/sys_info.cc", "//base/system/sys_info.h", "//base/system/sys_info_internal.h", "//base/task/thread_pool/initialization_util.cc", "//base/task/thread_pool/initialization_util.h", "//base/base_paths_android.cc", "//base/base_paths_android.h", "//base/task/thread_pool/semaphore/semaphore_posix.cc", "//base/base_paths_posix.h", "//base/memory/madv_free_discardable_memory_allocator_posix.cc", "//base/memory/madv_free_discardable_memory_allocator_posix.h", "//base/memory/madv_free_discardable_memory_posix.cc", "//base/memory/madv_free_discardable_memory_posix.h", "//base/posix/unix_domain_socket.cc", "//base/posix/unix_domain_socket.h", "//base/rand_util_posix.cc", "//base/system/sys_info_posix.cc", "//base/files/file_descriptor_watcher_posix.cc", "//base/files/file_descriptor_watcher_posix.h", "//base/files/file_enumerator_posix.cc", "//base/files/file_util_posix.cc", "//base/memory/page_size_posix.cc", "//base/process/process_metrics_posix.cc", "//base/sync_socket_posix.cc", "//base/native_library_posix.cc", "//base/posix/can_lower_nice_to.cc", "//base/posix/can_lower_nice_to.h", "//base/process/launch_posix.cc", "//base/profiler/module_cache_posix.cc", "//base/profiler/stack_base_address_posix.cc", "//base/profiler/stack_base_address_posix.h", "//base/profiler/stack_copier_signal.cc", "//base/profiler/stack_copier_signal.h", "//base/profiler/thread_delegate_posix.cc", "//base/profiler/thread_delegate_posix.h", "//base/process/process_posix.cc", "//base/memory/discardable_shared_memory.cc", "//base/memory/discardable_shared_memory.h", "//base/process/kill.cc", "//base/process/kill.h", "//base/process/launch.cc", "//base/process/launch.h", "//base/process/memory.cc", "//base/process/memory.h", "//base/process/process_iterator.cc", "//base/process/process_iterator.h", "//base/process/kill_posix.cc", "//base/file_descriptor_store.cc", "//base/file_descriptor_store.h", "//base/files/file_path_watcher.cc", "//base/files/file_path_watcher.h", "//base/sync_socket.cc", "//base/sync_socket.h", "//base/message_loop/message_pump_libevent.cc", "//base/message_loop/message_pump_libevent.h", "//base/message_loop/message_pump_epoll.cc", "//base/message_loop/message_pump_epoll.h", "//base/strings/sys_string_conversions_posix.cc", "//base/synchronization/waitable_event_posix.cc", "//base/synchronization/waitable_event_watcher_posix.cc", "//base/threading/platform_thread_internal_posix.cc", "//base/threading/platform_thread_internal_posix.h", "//base/time/time_exploded_posix.cc", "//base/time/time_now_posix.cc", "//base/time/time_exploded_icu.cc", "//base/time/time_android.cc", "//base/trace_event/trace_event_stub.cc", "//base/trace_event/trace_event_stub.h" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -1645,20 +1669,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wshorten-64-to-32", "-Wimplicit-int-conversion", "-Wsign-compare", "-Wsign-conversion", "-Wtautological-unsigned-zero-compare", "-Wexit-time-destructors", "-Wglobal-constructors", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wshorten-64-to-32", "-Wimplicit-int-conversion", "-Wsign-compare", "-Wsign-conversion", "-Wtautological-unsigned-zero-compare", "-Wexit-time-destructors", "-Wglobal-constructors", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:precompiled_headers", "//build/config/compiler:prevent_unsafe_narrowing", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wglobal_constructors", "//build/config/compiler:optimize_max", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/icu:icu_config" ],
-      "defines": [ "BASE_IMPLEMENTATION", "IS_RAW_PTR_IMPL", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:precompiled_headers", "//build/config/compiler:prevent_unsafe_narrowing", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wglobal_constructors", "//build/config/compiler:optimize_max", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/icu:icu_config" ],
+      "defines": [ "BASE_IMPLEMENTATION", "IS_RAW_PTR_IMPL", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
       "deps": [ "//base:anchor_functions_buildflags(//build/toolchain/linux:clang_x64)", "//base:base_static(//build/toolchain/linux:clang_x64)", "//base:build_date(//build/toolchain/linux:clang_x64)", "//base:cfi_buildflags(//build/toolchain/linux:clang_x64)", "//base:clang_profiling_buildflags(//build/toolchain/linux:clang_x64)", "//base:debugging_buildflags(//build/toolchain/linux:clang_x64)", "//base:feature_list_buildflags(//build/toolchain/linux:clang_x64)", "//base:ios_cronet_buildflags(//build/toolchain/linux:clang_x64)", "//base:logging_buildflags(//build/toolchain/linux:clang_x64)", "//base:message_pump_buildflags(//build/toolchain/linux:clang_x64)", "//base:nodebug_assertion(//build/toolchain/linux:clang_x64)", "//base:orderfile_buildflags(//build/toolchain/linux:clang_x64)", "//base:power_monitor_buildflags(//build/toolchain/linux:clang_x64)", "//base:profiler_buildflags(//build/toolchain/linux:clang_x64)", "//base:rust_buildflags(//build/toolchain/linux:clang_x64)", "//base:sanitizer_buildflags(//build/toolchain/linux:clang_x64)", "//base:synchronization_buildflags(//build/toolchain/linux:clang_x64)", "//base:tracing_buildflags(//build/toolchain/linux:clang_x64)", "//base/allocator:buildflags(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator:buildflags(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator:partition_alloc(//build/toolchain/linux:clang_x64)", "//base/allocator/partition_allocator:raw_ptr(//build/toolchain/linux:clang_x64)", "//base/numerics:base_numerics(//build/toolchain/linux:clang_x64)", "//base/third_party/double_conversion:double_conversion(//build/toolchain/linux:clang_x64)", "//base/third_party/dynamic_annotations:dynamic_annotations(//build/toolchain/linux:clang_x64)", "//build:blink_buildflags(//build/toolchain/linux:clang_x64)", "//build:branding_buildflags(//build/toolchain/linux:clang_x64)", "//build:chromecast_buildflags(//build/toolchain/linux:clang_x64)", "//build:chromeos_buildflags(//build/toolchain/linux:clang_x64)", "//build/config/compiler:compiler_buildflags(//build/toolchain/linux:clang_x64)", "//third_party/abseil-cpp:absl(//build/toolchain/linux:clang_x64)", "//third_party/boringssl:boringssl(//build/toolchain/linux:clang_x64)", "//third_party/icu:icui18n(//build/toolchain/linux:clang_x64)", "//third_party/icu:icuuc(//build/toolchain/linux:clang_x64)", "//third_party/libevent:libevent(//build/toolchain/linux:clang_x64)", "//third_party/modp_b64:modp_b64(//build/toolchain/linux:clang_x64)" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/clang_x64/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
       "metadata": {
 
       },
@@ -1666,7 +1690,7 @@
       "public": "*",
       "public_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config" ],
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=x86_64-unknown-linux-gnu", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Zdwarf-version=4", "-Cdebuginfo=1", "-Copt-level=3" ],
-      "sources": [ "//base/allocator/allocator_check.cc", "//base/allocator/allocator_check.h", "//base/allocator/allocator_extension.cc", "//base/allocator/allocator_extension.h", "//base/allocator/dispatcher/configuration.h", "//base/allocator/dispatcher/dispatcher.cc", "//base/allocator/dispatcher/dispatcher.h", "//base/allocator/dispatcher/initializer.h", "//base/allocator/dispatcher/internal/dispatch_data.cc", "//base/allocator/dispatcher/internal/dispatch_data.h", "//base/allocator/dispatcher/internal/dispatcher_internal.h", "//base/allocator/dispatcher/internal/tools.h", "//base/allocator/dispatcher/reentry_guard.cc", "//base/allocator/dispatcher/reentry_guard.h", "//base/allocator/dispatcher/subsystem.h", "//base/allocator/dispatcher/tls.cc", "//base/allocator/dispatcher/tls.h", "//base/at_exit.cc", "//base/at_exit.h", "//base/atomic_ref_count.h", "//base/atomic_sequence_num.h", "//base/atomicops.h", "//base/atomicops_internals_atomicword_compat.h", "//base/atomicops_internals_portable.h", "//base/auto_reset.h", "//base/barrier_callback.h", "//base/barrier_closure.cc", "//base/barrier_closure.h", "//base/base64.cc", "//base/base64.h", "//base/base64url.cc", "//base/base64url.h", "//base/base_switches.h", "//base/big_endian.cc", "//base/big_endian.h", "//base/bit_cast.h", "//base/bits.h", "//base/build_time.h", "//base/callback_list.cc", "//base/callback_list.h", "//base/cancelable_callback.h", "//base/check.cc", "//base/check.h", "//base/check_deref.h", "//base/check_is_test.cc", "//base/check_is_test.h", "//base/check_op.cc", "//base/check_op.h", "//base/command_line.cc", "//base/command_line.h", "//base/compiler_specific.h", "//base/component_export.h", "//base/containers/adapters.h", "//base/containers/buffer_iterator.h", "//base/containers/checked_iterators.h", "//base/containers/circular_deque.h", "//base/containers/contains.h", "//base/containers/contiguous_iterator.h", "//base/containers/cxx20_erase.h", "//base/containers/cxx20_erase_deque.h", "//base/containers/cxx20_erase_forward_list.h", "//base/containers/cxx20_erase_internal.h", "//base/containers/cxx20_erase_list.h", "//base/containers/cxx20_erase_map.h", "//base/containers/cxx20_erase_set.h", "//base/containers/cxx20_erase_string.h", "//base/containers/cxx20_erase_unordered_map.h", "//base/containers/cxx20_erase_unordered_set.h", "//base/containers/cxx20_erase_vector.h", "//base/containers/enum_set.h", "//base/containers/extend.h", "//base/containers/fixed_flat_map.h", "//base/containers/fixed_flat_set.h", "//base/containers/flat_map.h", "//base/containers/flat_set.h", "//base/containers/flat_tree.cc", "//base/containers/flat_tree.h", "//base/containers/id_map.h", "//base/containers/intrusive_heap.cc", "//base/containers/intrusive_heap.h", "//base/containers/linked_list.cc", "//base/containers/linked_list.h", "//base/containers/lru_cache.h", "//base/containers/map_util.h", "//base/containers/small_map.h", "//base/containers/span.h", "//base/containers/stack.h", "//base/containers/unique_ptr_adapters.h", "//base/containers/util.h", "//base/containers/vector_buffer.h", "//base/cpu_reduction_experiment.cc", "//base/cpu_reduction_experiment.h", "//base/critical_closure.h", "//base/cxx20_is_constant_evaluated.h", "//base/cxx20_to_address.h", "//base/dcheck_is_on.h", "//base/debug/alias.cc", "//base/debug/alias.h", "//base/debug/asan_invalid_access.cc", "//base/debug/asan_invalid_access.h", "//base/debug/asan_service.cc", "//base/debug/asan_service.h", "//base/debug/buffered_dwarf_reader.cc", "//base/debug/buffered_dwarf_reader.h", "//base/debug/debugger.cc", "//base/debug/debugger.h", "//base/debug/dump_without_crashing.cc", "//base/debug/dump_without_crashing.h", "//base/debug/dwarf_line_no.cc", "//base/debug/dwarf_line_no.h", "//base/debug/leak_annotations.h", "//base/debug/profiler.cc", "//base/debug/profiler.h", "//base/debug/task_trace.cc", "//base/debug/task_trace.h", "//base/environment.cc", "//base/environment.h", "//base/export_template.h", "//base/feature_list.cc", "//base/feature_list.h", "//base/features.cc", "//base/features.h", "//base/file_version_info.h", "//base/files/block_tests_writing_to_special_dirs.cc", "//base/files/block_tests_writing_to_special_dirs.h", "//base/files/dir_reader_fallback.h", "//base/files/file.cc", "//base/files/file.h", "//base/files/file_error_or.h", "//base/files/file_path.cc", "//base/files/file_path.h", "//base/files/file_tracing.cc", "//base/files/file_tracing.h", "//base/files/memory_mapped_file.cc", "//base/files/memory_mapped_file.h", "//base/files/platform_file.h", "//base/files/safe_base_name.cc", "//base/files/safe_base_name.h", "//base/files/scoped_file.cc", "//base/files/scoped_file.h", "//base/format_macros.h", "//base/functional/bind.h", "//base/functional/bind_internal.h", "//base/functional/callback.h", "//base/functional/callback_forward.h", "//base/functional/callback_helpers.cc", "//base/functional/callback_helpers.h", "//base/functional/callback_internal.cc", "//base/functional/callback_internal.h", "//base/functional/callback_tags.h", "//base/functional/disallow_unretained.h", "//base/functional/function_ref.h", "//base/functional/identity.h", "//base/functional/invoke.h", "//base/functional/not_fn.h", "//base/functional/overloaded.h", "//base/functional/unretained_traits.h", "//base/gtest_prod_util.h", "//base/hash/hash.cc", "//base/hash/hash.h", "//base/hash/legacy_hash.cc", "//base/hash/legacy_hash.h", "//base/json/json_common.h", "//base/json/json_parser.cc", "//base/json/json_parser.h", "//base/json/json_reader.cc", "//base/json/json_reader.h", "//base/json/json_string_value_serializer.cc", "//base/json/json_string_value_serializer.h", "//base/json/json_value_converter.cc", "//base/json/json_value_converter.h", "//base/json/json_writer.cc", "//base/json/json_writer.h", "//base/json/string_escape.cc", "//base/json/string_escape.h", "//base/json/values_util.cc", "//base/json/values_util.h", "//base/lazy_instance.h", "//base/lazy_instance_helpers.cc", "//base/lazy_instance_helpers.h", "//base/linux_util.cc", "//base/linux_util.h", "//base/location.cc", "//base/location.h", "//base/logging.cc", "//base/logging.h", "//base/macros/concat.h", "//base/macros/if.h", "//base/macros/remove_parens.h", "//base/macros/uniquify.h", "//base/memory/aligned_memory.cc", "//base/memory/aligned_memory.h", "//base/memory/free_deleter.h", "//base/memory/memory_pressure_listener.cc", "//base/memory/memory_pressure_listener.h", "//base/memory/memory_pressure_monitor.cc", "//base/memory/memory_pressure_monitor.h", "//base/memory/nonscannable_memory.cc", "//base/memory/nonscannable_memory.h", "//base/memory/page_size.h", "//base/memory/platform_shared_memory_handle.cc", "//base/memory/platform_shared_memory_handle.h", "//base/memory/platform_shared_memory_mapper.h", "//base/memory/platform_shared_memory_region.cc", "//base/memory/platform_shared_memory_region.h", "//base/memory/ptr_util.h", "//base/memory/raw_ptr.h", "//base/memory/raw_ptr_asan_bound_arg_tracker.cc", "//base/memory/raw_ptr_asan_bound_arg_tracker.h", "//base/memory/raw_ptr_asan_hooks.cc", "//base/memory/raw_ptr_asan_hooks.h", "//base/memory/raw_ptr_asan_service.cc", "//base/memory/raw_ptr_asan_service.h", "//base/memory/raw_ptr_cast.h", "//base/memory/raw_ptr_exclusion.h", "//base/memory/raw_ref.h", "//base/memory/raw_scoped_refptr_mismatch_checker.h", "//base/memory/raw_span.h", "//base/memory/read_only_shared_memory_region.cc", "//base/memory/read_only_shared_memory_region.h", "//base/memory/ref_counted.cc", "//base/memory/ref_counted.h", "//base/memory/ref_counted_delete_on_sequence.h", "//base/memory/ref_counted_memory.cc", "//base/memory/ref_counted_memory.h", "//base/memory/safe_ref.h", "//base/memory/safe_ref_traits.h", "//base/memory/safety_checks.h", "//base/memory/scoped_policy.h", "//base/memory/scoped_refptr.h", "//base/memory/shared_memory_hooks.h", "//base/memory/shared_memory_mapper.cc", "//base/memory/shared_memory_mapper.h", "//base/memory/shared_memory_mapping.cc", "//base/memory/shared_memory_mapping.h", "//base/memory/shared_memory_security_policy.cc", "//base/memory/shared_memory_security_policy.h", "//base/memory/shared_memory_tracker.cc", "//base/memory/shared_memory_tracker.h", "//base/memory/singleton.h", "//base/memory/stack_allocated.h", "//base/memory/unsafe_shared_memory_pool.cc", "//base/memory/unsafe_shared_memory_pool.h", "//base/memory/unsafe_shared_memory_region.cc", "//base/memory/unsafe_shared_memory_region.h", "//base/memory/values_equivalent.h", "//base/memory/weak_auto_reset.h", "//base/memory/weak_ptr.cc", "//base/memory/weak_ptr.h", "//base/memory/writable_shared_memory_region.cc", "//base/memory/writable_shared_memory_region.h", "//base/message_loop/message_pump.cc", "//base/message_loop/message_pump.h", "//base/message_loop/message_pump_default.cc", "//base/message_loop/message_pump_default.h", "//base/message_loop/message_pump_for_io.h", "//base/message_loop/message_pump_for_ui.h", "//base/message_loop/message_pump_type.h", "//base/message_loop/work_id_provider.cc", "//base/message_loop/work_id_provider.h", "//base/metrics/bucket_ranges.cc", "//base/metrics/bucket_ranges.h", "//base/metrics/crc32.cc", "//base/metrics/crc32.h", "//base/metrics/dummy_histogram.cc", "//base/metrics/dummy_histogram.h", "//base/metrics/field_trial.cc", "//base/metrics/field_trial.h", "//base/metrics/field_trial_list_including_low_anonymity.cc", "//base/metrics/field_trial_list_including_low_anonymity.h", "//base/metrics/field_trial_param_associator.cc", "//base/metrics/field_trial_param_associator.h", "//base/metrics/field_trial_params.cc", "//base/metrics/field_trial_params.h", "//base/metrics/histogram.cc", "//base/metrics/histogram.h", "//base/metrics/histogram_base.cc", "//base/metrics/histogram_base.h", "//base/metrics/histogram_delta_serialization.cc", "//base/metrics/histogram_delta_serialization.h", "//base/metrics/histogram_flattener.h", "//base/metrics/histogram_functions.cc", "//base/metrics/histogram_functions.h", "//base/metrics/histogram_macros.h", "//base/metrics/histogram_macros_internal.h", "//base/metrics/histogram_macros_local.h", "//base/metrics/histogram_samples.cc", "//base/metrics/histogram_samples.h", "//base/metrics/histogram_shared_memory.cc", "//base/metrics/histogram_shared_memory.h", "//base/metrics/histogram_snapshot_manager.cc", "//base/metrics/histogram_snapshot_manager.h", "//base/metrics/metrics_hashes.cc", "//base/metrics/metrics_hashes.h", "//base/metrics/persistent_histogram_allocator.cc", "//base/metrics/persistent_histogram_allocator.h", "//base/metrics/persistent_memory_allocator.cc", "//base/metrics/persistent_memory_allocator.h", "//base/metrics/persistent_sample_map.cc", "//base/metrics/persistent_sample_map.h", "//base/metrics/ranges_manager.cc", "//base/metrics/ranges_manager.h", "//base/metrics/record_histogram_checker.h", "//base/metrics/sample_map.cc", "//base/metrics/sample_map.h", "//base/metrics/sample_vector.cc", "//base/metrics/sample_vector.h", "//base/metrics/single_sample_metrics.cc", "//base/metrics/single_sample_metrics.h", "//base/metrics/sparse_histogram.cc", "//base/metrics/sparse_histogram.h", "//base/metrics/statistics_recorder.cc", "//base/metrics/statistics_recorder.h", "//base/metrics/user_metrics.cc", "//base/metrics/user_metrics.h", "//base/metrics/user_metrics_action.h", "//base/no_destructor.h", "//base/notreached.h", "//base/observer_list.h", "//base/observer_list_internal.cc", "//base/observer_list_internal.h", "//base/observer_list_threadsafe.cc", "//base/observer_list_threadsafe.h", "//base/observer_list_types.cc", "//base/observer_list_types.h", "//base/one_shot_event.cc", "//base/one_shot_event.h", "//base/parameter_pack.h", "//base/pending_task.cc", "//base/pending_task.h", "//base/pickle.cc", "//base/pickle.h", "//base/power_monitor/battery_level_provider.cc", "//base/power_monitor/battery_level_provider.h", "//base/power_monitor/battery_state_sampler.cc", "//base/power_monitor/battery_state_sampler.h", "//base/power_monitor/power_monitor.cc", "//base/power_monitor/power_monitor.h", "//base/power_monitor/power_monitor_device_source.cc", "//base/power_monitor/power_monitor_device_source.h", "//base/power_monitor/power_monitor_features.cc", "//base/power_monitor/power_monitor_features.h", "//base/power_monitor/power_monitor_source.cc", "//base/power_monitor/power_monitor_source.h", "//base/power_monitor/power_observer.h", "//base/power_monitor/sampling_event_source.cc", "//base/power_monitor/sampling_event_source.h", "//base/power_monitor/timer_sampling_event_source.cc", "//base/power_monitor/timer_sampling_event_source.h", "//base/process/current_process.cc", "//base/process/current_process.h", "//base/process/current_process_test.h", "//base/process/environment_internal.cc", "//base/process/environment_internal.h", "//base/process/process.h", "//base/process/process_handle.cc", "//base/process/process_handle.h", "//base/process/process_info.h", "//base/process/process_metrics_iocounters.h", "//base/profiler/frame.cc", "//base/profiler/frame.h", "//base/profiler/metadata_recorder.cc", "//base/profiler/metadata_recorder.h", "//base/profiler/module_cache.cc", "//base/profiler/module_cache.h", "//base/profiler/profile_builder.h", "//base/profiler/register_context.h", "//base/profiler/sample_metadata.cc", "//base/profiler/sample_metadata.h", "//base/profiler/sampling_profiler_thread_token.cc", "//base/profiler/sampling_profiler_thread_token.h", "//base/profiler/stack_buffer.cc", "//base/profiler/stack_buffer.h", "//base/profiler/stack_copier.cc", "//base/profiler/stack_copier.h", "//base/profiler/stack_copier_suspend.cc", "//base/profiler/stack_copier_suspend.h", "//base/profiler/stack_sampler.cc", "//base/profiler/stack_sampler.h", "//base/profiler/stack_sampling_profiler.cc", "//base/profiler/stack_sampling_profiler.h", "//base/profiler/suspendable_thread_delegate.h", "//base/profiler/thread_delegate.h", "//base/profiler/unwinder.cc", "//base/profiler/unwinder.h", "//base/rand_util.cc", "//base/rand_util.h", "//base/ranges/algorithm.h", "//base/ranges/functional.h", "//base/ranges/ranges.h", "//base/run_loop.cc", "//base/run_loop.h", "//base/sampling_heap_profiler/lock_free_address_hash_set.cc", "//base/sampling_heap_profiler/lock_free_address_hash_set.h", "//base/sampling_heap_profiler/poisson_allocation_sampler.cc", "//base/sampling_heap_profiler/poisson_allocation_sampler.h", "//base/sampling_heap_profiler/sampling_heap_profiler.cc", "//base/sampling_heap_profiler/sampling_heap_profiler.h", "//base/scoped_add_feature_flags.cc", "//base/scoped_add_feature_flags.h", "//base/scoped_clear_last_error.h", "//base/scoped_environment_variable_override.cc", "//base/scoped_environment_variable_override.h", "//base/scoped_generic.h", "//base/scoped_multi_source_observation.h", "//base/scoped_observation.h", "//base/scoped_observation_traits.h", "//base/scoped_observation_traits_internal.h", "//base/sequence_checker.cc", "//base/sequence_checker.h", "//base/sequence_checker_impl.cc", "//base/sequence_checker_impl.h", "//base/sequence_token.cc", "//base/sequence_token.h", "//base/state_transitions.h", "//base/stl_util.h", "//base/strings/abseil_string_number_conversions.cc", "//base/strings/abseil_string_number_conversions.h", "//base/strings/escape.cc", "//base/strings/escape.h", "//base/strings/latin1_string_conversions.cc", "//base/strings/latin1_string_conversions.h", "//base/strings/pattern.cc", "//base/strings/pattern.h", "//base/strings/safe_sprintf.cc", "//base/strings/safe_sprintf.h", "//base/strings/strcat.cc", "//base/strings/strcat.h", "//base/strings/strcat_internal.h", "//base/strings/string_number_conversions.cc", "//base/strings/string_number_conversions.h", "//base/strings/string_number_conversions_internal.h", "//base/strings/string_piece.h", "//base/strings/string_piece_forward.h", "//base/strings/string_split.cc", "//base/strings/string_split.h", "//base/strings/string_split_internal.h", "//base/strings/string_tokenizer.h", "//base/strings/string_util.cc", "//base/strings/string_util.h", "//base/strings/string_util_constants.cc", "//base/strings/string_util_impl_helpers.h", "//base/strings/string_util_internal.h", "//base/strings/stringize_macros.h", "//base/strings/stringprintf.cc", "//base/strings/stringprintf.h", "//base/strings/sys_string_conversions.h", "//base/strings/to_string.h", "//base/strings/utf_offset_string_conversions.cc", "//base/strings/utf_offset_string_conversions.h", "//base/strings/utf_ostream_operators.cc", "//base/strings/utf_ostream_operators.h", "//base/strings/utf_string_conversion_utils.cc", "//base/strings/utf_string_conversion_utils.h", "//base/strings/utf_string_conversions.cc", "//base/strings/utf_string_conversions.h", "//base/substring_set_matcher/matcher_string_pattern.cc", "//base/substring_set_matcher/matcher_string_pattern.h", "//base/substring_set_matcher/substring_set_matcher.cc", "//base/substring_set_matcher/substring_set_matcher.h", "//base/supports_user_data.cc", "//base/supports_user_data.h", "//base/synchronization/atomic_flag.cc", "//base/synchronization/atomic_flag.h", "//base/synchronization/condition_variable.h", "//base/synchronization/lock.cc", "//base/synchronization/lock.h", "//base/synchronization/lock_impl.h", "//base/synchronization/waitable_event.cc", "//base/synchronization/waitable_event.h", "//base/synchronization/waitable_event_watcher.h", "//base/sys_byteorder.h", "//base/syslog_logging.cc", "//base/syslog_logging.h", "//base/system/system_monitor.cc", "//base/system/system_monitor.h", "//base/task/bind_post_task.h", "//base/task/bind_post_task_internal.h", "//base/task/cancelable_task_tracker.cc", "//base/task/cancelable_task_tracker.h", "//base/task/common/checked_lock.h", "//base/task/common/checked_lock_impl.cc", "//base/task/common/checked_lock_impl.h", "//base/task/common/lazy_now.cc", "//base/task/common/lazy_now.h", "//base/task/common/operations_controller.cc", "//base/task/common/operations_controller.h", "//base/task/common/scoped_defer_task_posting.cc", "//base/task/common/scoped_defer_task_posting.h", "//base/task/common/task_annotator.cc", "//base/task/common/task_annotator.h", "//base/task/current_thread.cc", "//base/task/current_thread.h", "//base/task/default_delayed_task_handle_delegate.cc", "//base/task/default_delayed_task_handle_delegate.h", "//base/task/deferred_sequenced_task_runner.cc", "//base/task/deferred_sequenced_task_runner.h", "//base/task/delay_policy.h", "//base/task/delayed_task_handle.cc", "//base/task/delayed_task_handle.h", "//base/task/lazy_thread_pool_task_runner.cc", "//base/task/lazy_thread_pool_task_runner.h", "//base/task/post_job.cc", "//base/task/post_job.h", "//base/task/post_task_and_reply_with_result_internal.h", "//base/task/scoped_set_task_priority_for_current_thread.cc", "//base/task/scoped_set_task_priority_for_current_thread.h", "//base/task/sequence_manager/associated_thread_id.cc", "//base/task/sequence_manager/associated_thread_id.h", "//base/task/sequence_manager/atomic_flag_set.cc", "//base/task/sequence_manager/atomic_flag_set.h", "//base/task/sequence_manager/delayed_task_handle_delegate.cc", "//base/task/sequence_manager/delayed_task_handle_delegate.h", "//base/task/sequence_manager/enqueue_order.h", "//base/task/sequence_manager/enqueue_order_generator.cc", "//base/task/sequence_manager/enqueue_order_generator.h", "//base/task/sequence_manager/fence.cc", "//base/task/sequence_manager/fence.h", "//base/task/sequence_manager/lazily_deallocated_deque.h", "//base/task/sequence_manager/sequence_manager.cc", "//base/task/sequence_manager/sequence_manager.h", "//base/task/sequence_manager/sequence_manager_impl.cc", "//base/task/sequence_manager/sequence_manager_impl.h", "//base/task/sequence_manager/sequenced_task_source.cc", "//base/task/sequence_manager/sequenced_task_source.h", "//base/task/sequence_manager/task_order.cc", "//base/task/sequence_manager/task_order.h", "//base/task/sequence_manager/task_queue.cc", "//base/task/sequence_manager/task_queue.h", "//base/task/sequence_manager/task_queue_impl.cc", "//base/task/sequence_manager/task_queue_impl.h", "//base/task/sequence_manager/task_queue_selector.cc", "//base/task/sequence_manager/task_queue_selector.h", "//base/task/sequence_manager/task_time_observer.h", "//base/task/sequence_manager/tasks.cc", "//base/task/sequence_manager/tasks.h", "//base/task/sequence_manager/thread_controller.cc", "//base/task/sequence_manager/thread_controller.h", "//base/task/sequence_manager/thread_controller_impl.cc", "//base/task/sequence_manager/thread_controller_impl.h", "//base/task/sequence_manager/thread_controller_power_monitor.cc", "//base/task/sequence_manager/thread_controller_power_monitor.h", "//base/task/sequence_manager/thread_controller_with_message_pump_impl.cc", "//base/task/sequence_manager/thread_controller_with_message_pump_impl.h", "//base/task/sequence_manager/time_domain.cc", "//base/task/sequence_manager/time_domain.h", "//base/task/sequence_manager/wake_up_queue.cc", "//base/task/sequence_manager/wake_up_queue.h", "//base/task/sequence_manager/work_deduplicator.cc", "//base/task/sequence_manager/work_deduplicator.h", "//base/task/sequence_manager/work_queue.cc", "//base/task/sequence_manager/work_queue.h", "//base/task/sequence_manager/work_queue_sets.cc", "//base/task/sequence_manager/work_queue_sets.h", "//base/task/sequenced_task_runner.cc", "//base/task/sequenced_task_runner.h", "//base/task/sequenced_task_runner_helpers.h", "//base/task/single_thread_task_executor.cc", "//base/task/single_thread_task_executor.h", "//base/task/single_thread_task_runner.cc", "//base/task/single_thread_task_runner.h", "//base/task/single_thread_task_runner_thread_mode.h", "//base/task/task_features.cc", "//base/task/task_features.h", "//base/task/task_observer.h", "//base/task/task_runner.cc", "//base/task/task_runner.h", "//base/task/task_traits.cc", "//base/task/task_traits.h", "//base/task/thread_pool.cc", "//base/task/thread_pool.h", "//base/task/thread_pool/delayed_priority_queue.cc", "//base/task/thread_pool/delayed_priority_queue.h", "//base/task/thread_pool/delayed_task_manager.cc", "//base/task/thread_pool/delayed_task_manager.h", "//base/task/thread_pool/environment_config.cc", "//base/task/thread_pool/environment_config.h", "//base/task/thread_pool/job_task_source.cc", "//base/task/thread_pool/job_task_source.h", "//base/task/thread_pool/pooled_parallel_task_runner.cc", "//base/task/thread_pool/pooled_parallel_task_runner.h", "//base/task/thread_pool/pooled_sequenced_task_runner.cc", "//base/task/thread_pool/pooled_sequenced_task_runner.h", "//base/task/thread_pool/pooled_single_thread_task_runner_manager.cc", "//base/task/thread_pool/pooled_single_thread_task_runner_manager.h", "//base/task/thread_pool/pooled_task_runner_delegate.cc", "//base/task/thread_pool/pooled_task_runner_delegate.h", "//base/task/thread_pool/priority_queue.cc", "//base/task/thread_pool/priority_queue.h", "//base/task/thread_pool/semaphore.h", "//base/task/thread_pool/sequence.cc", "//base/task/thread_pool/sequence.h", "//base/task/thread_pool/service_thread.cc", "//base/task/thread_pool/service_thread.h", "//base/task/thread_pool/task.cc", "//base/task/thread_pool/task.h", "//base/task/thread_pool/task_source.cc", "//base/task/thread_pool/task_source.h", "//base/task/thread_pool/task_source_sort_key.cc", "//base/task/thread_pool/task_source_sort_key.h", "//base/task/thread_pool/task_tracker.cc", "//base/task/thread_pool/task_tracker.h", "//base/task/thread_pool/thread_group.cc", "//base/task/thread_pool/thread_group.h", "//base/task/thread_pool/thread_group_impl.cc", "//base/task/thread_pool/thread_group_impl.h", "//base/task/thread_pool/thread_pool_impl.cc", "//base/task/thread_pool/thread_pool_impl.h", "//base/task/thread_pool/thread_pool_instance.cc", "//base/task/thread_pool/thread_pool_instance.h", "//base/task/thread_pool/tracked_ref.h", "//base/task/thread_pool/worker_thread.cc", "//base/task/thread_pool/worker_thread.h", "//base/task/thread_pool/worker_thread_observer.h", "//base/task/thread_pool/worker_thread_set.cc", "//base/task/thread_pool/worker_thread_set.h", "//base/task/updateable_sequenced_task_runner.h", "//base/template_util.h", "//base/test/scoped_logging_settings.h", "//base/test/spin_wait.h", "//base/third_party/cityhash/city.cc", "//base/third_party/cityhash/city.h", "//base/third_party/cityhash_v103/src/city_v103.cc", "//base/third_party/cityhash_v103/src/city_v103.h", "//base/third_party/icu/icu_utf.h", "//base/third_party/nspr/prtime.cc", "//base/third_party/nspr/prtime.h", "//base/third_party/superfasthash/superfasthash.c", "//base/thread_annotations.h", "//base/threading/hang_watcher.cc", "//base/threading/hang_watcher.h", "//base/threading/platform_thread.cc", "//base/threading/platform_thread.h", "//base/threading/platform_thread_ref.cc", "//base/threading/platform_thread_ref.h", "//base/threading/post_task_and_reply_impl.cc", "//base/threading/post_task_and_reply_impl.h", "//base/threading/scoped_blocking_call.cc", "//base/threading/scoped_blocking_call.h", "//base/threading/scoped_blocking_call_internal.cc", "//base/threading/scoped_blocking_call_internal.h", "//base/threading/scoped_thread_priority.cc", "//base/threading/scoped_thread_priority.h", "//base/threading/sequence_bound.h", "//base/threading/sequence_bound_internal.h", "//base/threading/sequence_local_storage_map.cc", "//base/threading/sequence_local_storage_map.h", "//base/threading/sequence_local_storage_slot.cc", "//base/threading/sequence_local_storage_slot.h", "//base/threading/simple_thread.cc", "//base/threading/simple_thread.h", "//base/threading/thread.cc", "//base/threading/thread.h", "//base/threading/thread_checker.cc", "//base/threading/thread_checker.h", "//base/threading/thread_checker_impl.cc", "//base/threading/thread_checker_impl.h", "//base/threading/thread_collision_warner.cc", "//base/threading/thread_collision_warner.h", "//base/threading/thread_id_name_manager.cc", "//base/threading/thread_id_name_manager.h", "//base/threading/thread_local.h", "//base/threading/thread_local_internal.h", "//base/threading/thread_local_storage.cc", "//base/threading/thread_local_storage.h", "//base/threading/thread_restrictions.cc", "//base/threading/thread_restrictions.h", "//base/threading/threading_features.h", "//base/threading/watchdog.cc", "//base/threading/watchdog.h", "//base/time/clock.cc", "//base/time/clock.h", "//base/time/default_clock.cc", "//base/time/default_clock.h", "//base/time/default_tick_clock.cc", "//base/time/default_tick_clock.h", "//base/time/tick_clock.cc", "//base/time/tick_clock.h", "//base/time/time.cc", "//base/time/time.h", "//base/time/time_delta_from_string.cc", "//base/time/time_delta_from_string.h", "//base/time/time_override.cc", "//base/time/time_override.h", "//base/timer/elapsed_timer.cc", "//base/timer/elapsed_timer.h", "//base/timer/hi_res_timer_manager.h", "//base/timer/lap_timer.cc", "//base/timer/lap_timer.h", "//base/timer/timer.cc", "//base/timer/timer.h", "//base/timer/wall_clock_timer.cc", "//base/timer/wall_clock_timer.h", "//base/token.cc", "//base/token.h", "//base/trace_event/base_tracing.h", "//base/trace_event/base_tracing_forward.h", "//base/trace_event/common/trace_event_common.h", "//base/trace_event/heap_profiler_allocation_context.cc", "//base/trace_event/heap_profiler_allocation_context.h", "//base/trace_event/heap_profiler_allocation_context_tracker.cc", "//base/trace_event/heap_profiler_allocation_context_tracker.h", "//base/trace_event/memory_allocator_dump_guid.cc", "//base/trace_event/memory_allocator_dump_guid.h", "//base/trace_event/trace_id_helper.cc", "//base/trace_event/trace_id_helper.h", "//base/traits_bag.h", "//base/tuple.h", "//base/types/always_false.h", "//base/types/cxx23_to_underlying.h", "//base/types/expected.h", "//base/types/expected_internal.h", "//base/types/expected_macros.h", "//base/types/fixed_array.h", "//base/types/id_type.h", "//base/types/optional_ref.h", "//base/types/optional_util.h", "//base/types/pass_key.h", "//base/types/strong_alias.h", "//base/types/supports_ostream_operator.h", "//base/types/token_type.h", "//base/types/variant_util.h", "//base/unguessable_token.cc", "//base/unguessable_token.h", "//base/uuid.cc", "//base/uuid.h", "//base/value_iterators.cc", "//base/value_iterators.h", "//base/values.cc", "//base/values.h", "//base/version.cc", "//base/version.h", "//base/vlog.cc", "//base/vlog.h", "//base/debug/debugger_posix.cc", "//base/file_descriptor_posix.cc", "//base/file_descriptor_posix.h", "//base/files/dir_reader_posix.h", "//base/files/file_posix.cc", "//base/files/memory_mapped_file_posix.cc", "//base/message_loop/watchable_io_message_pump_posix.cc", "//base/message_loop/watchable_io_message_pump_posix.h", "//base/posix/eintr_wrapper.h", "//base/posix/file_descriptor_shuffle.cc", "//base/posix/file_descriptor_shuffle.h", "//base/posix/global_descriptors.cc", "//base/posix/global_descriptors.h", "//base/posix/safe_strerror.cc", "//base/posix/safe_strerror.h", "//base/process/process_handle_posix.cc", "//base/strings/string_util_posix.h", "//base/synchronization/condition_variable_posix.cc", "//base/synchronization/lock_impl_posix.cc", "//base/threading/platform_thread_posix.cc", "//base/threading/thread_local_storage_posix.cc", "//base/time/time_conversion_posix.cc", "//base/timer/hi_res_timer_manager_posix.cc", "//base/debug/proc_maps_linux.cc", "//base/debug/proc_maps_linux.h", "//base/files/dir_reader_linux.h", "//base/files/scoped_file_linux.cc", "//base/process/internal_linux.cc", "//base/process/internal_linux.h", "//base/process/memory_linux.cc", "//base/process/process_handle_linux.cc", "//base/process/process_iterator_linux.cc", "//base/process/process_linux.cc", "//base/process/process_metrics_linux.cc", "//base/threading/platform_thread_linux.cc", "//base/threading/platform_thread_linux_base.cc", "//base/threading/thread_type_delegate.cc", "//base/threading/thread_type_delegate.h", "//base/files/file_path_watcher_inotify.cc", "//base/files/file_path_watcher_inotify.h", "//base/hash/md5.h", "//base/hash/md5_constexpr.h", "//base/hash/md5_constexpr_internal.h", "//base/hash/sha1.h", "//base/hash/md5_boringssl.cc", "//base/hash/md5_boringssl.h", "//base/hash/sha1_boringssl.cc", "//base/hash/sha1_boringssl.h", "//base/base_paths.cc", "//base/base_paths.h", "//base/cpu.cc", "//base/cpu.h", "//base/debug/crash_logging.cc", "//base/debug/crash_logging.h", "//base/debug/stack_trace.cc", "//base/debug/stack_trace.h", "//base/files/file_enumerator.cc", "//base/files/file_enumerator.h", "//base/files/file_proxy.cc", "//base/files/file_proxy.h", "//base/files/file_util.cc", "//base/files/file_util.h", "//base/files/important_file_writer.cc", "//base/files/important_file_writer.h", "//base/files/important_file_writer_cleaner.cc", "//base/files/important_file_writer_cleaner.h", "//base/files/scoped_temp_dir.cc", "//base/files/scoped_temp_dir.h", "//base/files/scoped_temp_file.cc", "//base/files/scoped_temp_file.h", "//base/json/json_file_value_serializer.cc", "//base/json/json_file_value_serializer.h", "//base/memory/discardable_memory.cc", "//base/memory/discardable_memory.h", "//base/memory/discardable_memory_allocator.cc", "//base/memory/discardable_memory_allocator.h", "//base/memory/discardable_memory_internal.h", "//base/metrics/persistent_histogram_storage.cc", "//base/metrics/persistent_histogram_storage.h", "//base/native_library.cc", "//base/native_library.h", "//base/path_service.cc", "//base/path_service.h", "//base/process/process_metrics.cc", "//base/process/process_metrics.h", "//base/scoped_native_library.cc", "//base/scoped_native_library.h", "//base/system/sys_info.cc", "//base/system/sys_info.h", "//base/system/sys_info_internal.h", "//base/task/thread_pool/initialization_util.cc", "//base/task/thread_pool/initialization_util.h", "//base/task/thread_pool/semaphore/semaphore_posix.cc", "//base/base_paths_posix.h", "//base/memory/madv_free_discardable_memory_allocator_posix.cc", "//base/memory/madv_free_discardable_memory_allocator_posix.h", "//base/memory/madv_free_discardable_memory_posix.cc", "//base/memory/madv_free_discardable_memory_posix.h", "//base/posix/unix_domain_socket.cc", "//base/posix/unix_domain_socket.h", "//base/rand_util_posix.cc", "//base/system/sys_info_posix.cc", "//base/files/file_descriptor_watcher_posix.cc", "//base/files/file_descriptor_watcher_posix.h", "//base/files/file_enumerator_posix.cc", "//base/files/file_util_posix.cc", "//base/memory/page_size_posix.cc", "//base/process/process_metrics_posix.cc", "//base/sync_socket_posix.cc", "//base/native_library_posix.cc", "//base/posix/can_lower_nice_to.cc", "//base/posix/can_lower_nice_to.h", "//base/process/launch_posix.cc", "//base/profiler/module_cache_posix.cc", "//base/profiler/stack_base_address_posix.cc", "//base/profiler/stack_base_address_posix.h", "//base/profiler/stack_copier_signal.cc", "//base/profiler/stack_copier_signal.h", "//base/profiler/thread_delegate_posix.cc", "//base/profiler/thread_delegate_posix.h", "//base/debug/stack_trace_posix.cc", "//base/process/process_posix.cc", "//base/memory/discardable_shared_memory.cc", "//base/memory/discardable_shared_memory.h", "//base/process/kill.cc", "//base/process/kill.h", "//base/process/launch.cc", "//base/process/launch.h", "//base/process/memory.cc", "//base/process/memory.h", "//base/process/process_iterator.cc", "//base/process/process_iterator.h", "//base/process/kill_posix.cc", "//base/base_paths_posix.cc", "//base/debug/elf_reader.cc", "//base/debug/elf_reader.h", "//base/stack_canary_linux.cc", "//base/stack_canary_linux.h", "//base/file_descriptor_store.cc", "//base/file_descriptor_store.h", "//base/system/sys_info_linux.cc", "//base/files/file_path_watcher.cc", "//base/files/file_path_watcher.h", "//base/sync_socket.cc", "//base/sync_socket.h", "//base/message_loop/message_pump_libevent.cc", "//base/message_loop/message_pump_libevent.h", "//base/message_loop/message_pump_epoll.cc", "//base/message_loop/message_pump_epoll.h", "//base/memory/platform_shared_memory_mapper_posix.cc", "//base/memory/platform_shared_memory_region_posix.cc", "//base/strings/sys_string_conversions_posix.cc", "//base/synchronization/waitable_event_posix.cc", "//base/synchronization/waitable_event_watcher_posix.cc", "//base/threading/platform_thread_internal_posix.cc", "//base/threading/platform_thread_internal_posix.h", "//base/time/time_exploded_posix.cc", "//base/time/time_now_posix.cc", "//base/time/time_exploded_icu.cc", "//base/profiler/stack_sampler_posix.cc", "//base/power_monitor/power_monitor_device_source_stub.cc", "//base/trace_event/trace_event_stub.cc", "//base/trace_event/trace_event_stub.h" ],
+      "sources": [ "//base/allocator/allocator_check.cc", "//base/allocator/allocator_check.h", "//base/allocator/allocator_extension.cc", "//base/allocator/allocator_extension.h", "//base/allocator/dispatcher/configuration.h", "//base/allocator/dispatcher/dispatcher.cc", "//base/allocator/dispatcher/dispatcher.h", "//base/allocator/dispatcher/initializer.h", "//base/allocator/dispatcher/internal/dispatch_data.cc", "//base/allocator/dispatcher/internal/dispatch_data.h", "//base/allocator/dispatcher/internal/dispatcher_internal.h", "//base/allocator/dispatcher/internal/tools.h", "//base/allocator/dispatcher/reentry_guard.cc", "//base/allocator/dispatcher/reentry_guard.h", "//base/allocator/dispatcher/subsystem.h", "//base/allocator/dispatcher/tls.cc", "//base/allocator/dispatcher/tls.h", "//base/at_exit.cc", "//base/at_exit.h", "//base/atomic_ref_count.h", "//base/atomic_sequence_num.h", "//base/atomicops.h", "//base/atomicops_internals_atomicword_compat.h", "//base/atomicops_internals_portable.h", "//base/auto_reset.h", "//base/barrier_callback.h", "//base/barrier_closure.cc", "//base/barrier_closure.h", "//base/base64.cc", "//base/base64.h", "//base/base64url.cc", "//base/base64url.h", "//base/base_switches.h", "//base/big_endian.cc", "//base/big_endian.h", "//base/bit_cast.h", "//base/bits.h", "//base/build_time.h", "//base/callback_list.cc", "//base/callback_list.h", "//base/cancelable_callback.h", "//base/check.cc", "//base/check.h", "//base/check_deref.h", "//base/check_is_test.cc", "//base/check_is_test.h", "//base/check_op.cc", "//base/check_op.h", "//base/command_line.cc", "//base/command_line.h", "//base/compiler_specific.h", "//base/component_export.h", "//base/containers/adapters.h", "//base/containers/buffer_iterator.h", "//base/containers/checked_iterators.h", "//base/containers/circular_deque.h", "//base/containers/contains.h", "//base/containers/cxx20_erase.h", "//base/containers/cxx20_erase_internal.h", "//base/containers/cxx20_erase_map.h", "//base/containers/cxx20_erase_vector.h", "//base/containers/enum_set.h", "//base/containers/extend.h", "//base/containers/fixed_flat_map.h", "//base/containers/fixed_flat_set.h", "//base/containers/flat_map.h", "//base/containers/flat_set.h", "//base/containers/flat_tree.h", "//base/containers/id_map.h", "//base/containers/intrusive_heap.cc", "//base/containers/intrusive_heap.h", "//base/containers/linked_list.cc", "//base/containers/linked_list.h", "//base/containers/lru_cache.h", "//base/containers/map_util.h", "//base/containers/small_map.h", "//base/containers/span.h", "//base/containers/stack.h", "//base/containers/unique_ptr_adapters.h", "//base/containers/util.h", "//base/containers/vector_buffer.h", "//base/cpu_reduction_experiment.cc", "//base/cpu_reduction_experiment.h", "//base/critical_closure.h", "//base/dcheck_is_on.h", "//base/debug/alias.cc", "//base/debug/alias.h", "//base/debug/asan_invalid_access.cc", "//base/debug/asan_invalid_access.h", "//base/debug/asan_service.cc", "//base/debug/asan_service.h", "//base/debug/buffered_dwarf_reader.cc", "//base/debug/buffered_dwarf_reader.h", "//base/debug/debugger.cc", "//base/debug/debugger.h", "//base/debug/dump_without_crashing.cc", "//base/debug/dump_without_crashing.h", "//base/debug/dwarf_line_no.cc", "//base/debug/dwarf_line_no.h", "//base/debug/leak_annotations.h", "//base/debug/profiler.cc", "//base/debug/profiler.h", "//base/debug/task_trace.cc", "//base/debug/task_trace.h", "//base/environment.cc", "//base/environment.h", "//base/export_template.h", "//base/feature_list.cc", "//base/feature_list.h", "//base/features.cc", "//base/features.h", "//base/file_version_info.h", "//base/files/block_tests_writing_to_special_dirs.cc", "//base/files/block_tests_writing_to_special_dirs.h", "//base/files/dir_reader_fallback.h", "//base/files/file.cc", "//base/files/file.h", "//base/files/file_error_or.h", "//base/files/file_path.cc", "//base/files/file_path.h", "//base/files/file_tracing.cc", "//base/files/file_tracing.h", "//base/files/memory_mapped_file.cc", "//base/files/memory_mapped_file.h", "//base/files/platform_file.h", "//base/files/safe_base_name.cc", "//base/files/safe_base_name.h", "//base/files/scoped_file.cc", "//base/files/scoped_file.h", "//base/format_macros.h", "//base/functional/bind.h", "//base/functional/bind_internal.h", "//base/functional/callback.h", "//base/functional/callback_forward.h", "//base/functional/callback_helpers.cc", "//base/functional/callback_helpers.h", "//base/functional/callback_internal.cc", "//base/functional/callback_internal.h", "//base/functional/callback_tags.h", "//base/functional/disallow_unretained.h", "//base/functional/function_ref.h", "//base/functional/not_fn.h", "//base/functional/overloaded.h", "//base/functional/unretained_traits.h", "//base/gtest_prod_util.h", "//base/hash/hash.cc", "//base/hash/hash.h", "//base/hash/legacy_hash.cc", "//base/hash/legacy_hash.h", "//base/json/json_common.h", "//base/json/json_parser.cc", "//base/json/json_parser.h", "//base/json/json_reader.cc", "//base/json/json_reader.h", "//base/json/json_string_value_serializer.cc", "//base/json/json_string_value_serializer.h", "//base/json/json_value_converter.cc", "//base/json/json_value_converter.h", "//base/json/json_writer.cc", "//base/json/json_writer.h", "//base/json/string_escape.cc", "//base/json/string_escape.h", "//base/json/values_util.cc", "//base/json/values_util.h", "//base/lazy_instance.h", "//base/lazy_instance_helpers.cc", "//base/lazy_instance_helpers.h", "//base/linux_util.cc", "//base/linux_util.h", "//base/location.cc", "//base/location.h", "//base/logging.cc", "//base/logging.h", "//base/macros/concat.h", "//base/macros/if.h", "//base/macros/remove_parens.h", "//base/macros/uniquify.h", "//base/memory/aligned_memory.cc", "//base/memory/aligned_memory.h", "//base/memory/free_deleter.h", "//base/memory/memory_pressure_listener.cc", "//base/memory/memory_pressure_listener.h", "//base/memory/memory_pressure_monitor.cc", "//base/memory/memory_pressure_monitor.h", "//base/memory/nonscannable_memory.cc", "//base/memory/nonscannable_memory.h", "//base/memory/page_size.h", "//base/memory/platform_shared_memory_handle.cc", "//base/memory/platform_shared_memory_handle.h", "//base/memory/platform_shared_memory_mapper.h", "//base/memory/platform_shared_memory_region.cc", "//base/memory/platform_shared_memory_region.h", "//base/memory/ptr_util.h", "//base/memory/raw_ptr.h", "//base/memory/raw_ptr_asan_bound_arg_tracker.cc", "//base/memory/raw_ptr_asan_bound_arg_tracker.h", "//base/memory/raw_ptr_asan_hooks.cc", "//base/memory/raw_ptr_asan_hooks.h", "//base/memory/raw_ptr_asan_service.cc", "//base/memory/raw_ptr_asan_service.h", "//base/memory/raw_ptr_cast.h", "//base/memory/raw_ptr_exclusion.h", "//base/memory/raw_ref.h", "//base/memory/raw_scoped_refptr_mismatch_checker.h", "//base/memory/raw_span.h", "//base/memory/read_only_shared_memory_region.cc", "//base/memory/read_only_shared_memory_region.h", "//base/memory/ref_counted.cc", "//base/memory/ref_counted.h", "//base/memory/ref_counted_delete_on_sequence.h", "//base/memory/ref_counted_memory.cc", "//base/memory/ref_counted_memory.h", "//base/memory/safe_ref.h", "//base/memory/safe_ref_traits.h", "//base/memory/safety_checks.h", "//base/memory/scoped_policy.h", "//base/memory/scoped_refptr.h", "//base/memory/shared_memory_hooks.h", "//base/memory/shared_memory_mapper.cc", "//base/memory/shared_memory_mapper.h", "//base/memory/shared_memory_mapping.cc", "//base/memory/shared_memory_mapping.h", "//base/memory/shared_memory_security_policy.cc", "//base/memory/shared_memory_security_policy.h", "//base/memory/shared_memory_tracker.cc", "//base/memory/shared_memory_tracker.h", "//base/memory/singleton.h", "//base/memory/stack_allocated.h", "//base/memory/unsafe_shared_memory_pool.cc", "//base/memory/unsafe_shared_memory_pool.h", "//base/memory/unsafe_shared_memory_region.cc", "//base/memory/unsafe_shared_memory_region.h", "//base/memory/values_equivalent.h", "//base/memory/weak_auto_reset.h", "//base/memory/weak_ptr.cc", "//base/memory/weak_ptr.h", "//base/memory/writable_shared_memory_region.cc", "//base/memory/writable_shared_memory_region.h", "//base/message_loop/message_pump.cc", "//base/message_loop/message_pump.h", "//base/message_loop/message_pump_default.cc", "//base/message_loop/message_pump_default.h", "//base/message_loop/message_pump_for_io.h", "//base/message_loop/message_pump_for_ui.h", "//base/message_loop/message_pump_type.h", "//base/message_loop/work_id_provider.cc", "//base/message_loop/work_id_provider.h", "//base/metrics/bucket_ranges.cc", "//base/metrics/bucket_ranges.h", "//base/metrics/crc32.cc", "//base/metrics/crc32.h", "//base/metrics/dummy_histogram.cc", "//base/metrics/dummy_histogram.h", "//base/metrics/field_trial.cc", "//base/metrics/field_trial.h", "//base/metrics/field_trial_list_including_low_anonymity.cc", "//base/metrics/field_trial_list_including_low_anonymity.h", "//base/metrics/field_trial_param_associator.cc", "//base/metrics/field_trial_param_associator.h", "//base/metrics/field_trial_params.cc", "//base/metrics/field_trial_params.h", "//base/metrics/histogram.cc", "//base/metrics/histogram.h", "//base/metrics/histogram_base.cc", "//base/metrics/histogram_base.h", "//base/metrics/histogram_delta_serialization.cc", "//base/metrics/histogram_delta_serialization.h", "//base/metrics/histogram_flattener.h", "//base/metrics/histogram_functions.cc", "//base/metrics/histogram_functions.h", "//base/metrics/histogram_macros.h", "//base/metrics/histogram_macros_internal.h", "//base/metrics/histogram_macros_local.h", "//base/metrics/histogram_samples.cc", "//base/metrics/histogram_samples.h", "//base/metrics/histogram_shared_memory.cc", "//base/metrics/histogram_shared_memory.h", "//base/metrics/histogram_snapshot_manager.cc", "//base/metrics/histogram_snapshot_manager.h", "//base/metrics/metrics_hashes.cc", "//base/metrics/metrics_hashes.h", "//base/metrics/persistent_histogram_allocator.cc", "//base/metrics/persistent_histogram_allocator.h", "//base/metrics/persistent_memory_allocator.cc", "//base/metrics/persistent_memory_allocator.h", "//base/metrics/persistent_sample_map.cc", "//base/metrics/persistent_sample_map.h", "//base/metrics/ranges_manager.cc", "//base/metrics/ranges_manager.h", "//base/metrics/record_histogram_checker.h", "//base/metrics/sample_map.cc", "//base/metrics/sample_map.h", "//base/metrics/sample_vector.cc", "//base/metrics/sample_vector.h", "//base/metrics/single_sample_metrics.cc", "//base/metrics/single_sample_metrics.h", "//base/metrics/sparse_histogram.cc", "//base/metrics/sparse_histogram.h", "//base/metrics/statistics_recorder.cc", "//base/metrics/statistics_recorder.h", "//base/metrics/user_metrics.cc", "//base/metrics/user_metrics.h", "//base/metrics/user_metrics_action.h", "//base/no_destructor.h", "//base/notreached.h", "//base/observer_list.h", "//base/observer_list_internal.cc", "//base/observer_list_internal.h", "//base/observer_list_threadsafe.cc", "//base/observer_list_threadsafe.h", "//base/observer_list_types.cc", "//base/observer_list_types.h", "//base/one_shot_event.cc", "//base/one_shot_event.h", "//base/parameter_pack.h", "//base/pending_task.cc", "//base/pending_task.h", "//base/pickle.cc", "//base/pickle.h", "//base/power_monitor/battery_level_provider.cc", "//base/power_monitor/battery_level_provider.h", "//base/power_monitor/battery_state_sampler.cc", "//base/power_monitor/battery_state_sampler.h", "//base/power_monitor/power_monitor.cc", "//base/power_monitor/power_monitor.h", "//base/power_monitor/power_monitor_device_source.cc", "//base/power_monitor/power_monitor_device_source.h", "//base/power_monitor/power_monitor_features.cc", "//base/power_monitor/power_monitor_features.h", "//base/power_monitor/power_monitor_source.cc", "//base/power_monitor/power_monitor_source.h", "//base/power_monitor/power_observer.h", "//base/power_monitor/sampling_event_source.cc", "//base/power_monitor/sampling_event_source.h", "//base/power_monitor/timer_sampling_event_source.cc", "//base/power_monitor/timer_sampling_event_source.h", "//base/process/current_process.cc", "//base/process/current_process.h", "//base/process/current_process_test.h", "//base/process/environment_internal.cc", "//base/process/environment_internal.h", "//base/process/process.h", "//base/process/process_handle.cc", "//base/process/process_handle.h", "//base/process/process_info.h", "//base/process/process_metrics_iocounters.h", "//base/profiler/frame.cc", "//base/profiler/frame.h", "//base/profiler/metadata_recorder.cc", "//base/profiler/metadata_recorder.h", "//base/profiler/module_cache.cc", "//base/profiler/module_cache.h", "//base/profiler/profile_builder.h", "//base/profiler/register_context.h", "//base/profiler/sample_metadata.cc", "//base/profiler/sample_metadata.h", "//base/profiler/sampling_profiler_thread_token.cc", "//base/profiler/sampling_profiler_thread_token.h", "//base/profiler/stack_buffer.cc", "//base/profiler/stack_buffer.h", "//base/profiler/stack_copier.cc", "//base/profiler/stack_copier.h", "//base/profiler/stack_copier_suspend.cc", "//base/profiler/stack_copier_suspend.h", "//base/profiler/stack_sampler.cc", "//base/profiler/stack_sampler.h", "//base/profiler/stack_sampling_profiler.cc", "//base/profiler/stack_sampling_profiler.h", "//base/profiler/suspendable_thread_delegate.h", "//base/profiler/thread_delegate.h", "//base/profiler/unwinder.cc", "//base/profiler/unwinder.h", "//base/rand_util.cc", "//base/rand_util.h", "//base/ranges/algorithm.h", "//base/ranges/functional.h", "//base/ranges/ranges.h", "//base/run_loop.cc", "//base/run_loop.h", "//base/sampling_heap_profiler/lock_free_address_hash_set.cc", "//base/sampling_heap_profiler/lock_free_address_hash_set.h", "//base/sampling_heap_profiler/poisson_allocation_sampler.cc", "//base/sampling_heap_profiler/poisson_allocation_sampler.h", "//base/sampling_heap_profiler/sampling_heap_profiler.cc", "//base/sampling_heap_profiler/sampling_heap_profiler.h", "//base/scoped_add_feature_flags.cc", "//base/scoped_add_feature_flags.h", "//base/scoped_clear_last_error.h", "//base/scoped_environment_variable_override.cc", "//base/scoped_environment_variable_override.h", "//base/scoped_generic.h", "//base/scoped_multi_source_observation.h", "//base/scoped_observation.h", "//base/scoped_observation_traits.h", "//base/sequence_checker.cc", "//base/sequence_checker.h", "//base/sequence_checker_impl.cc", "//base/sequence_checker_impl.h", "//base/sequence_token.cc", "//base/sequence_token.h", "//base/state_transitions.h", "//base/stl_util.h", "//base/strings/abseil_string_number_conversions.cc", "//base/strings/abseil_string_number_conversions.h", "//base/strings/escape.cc", "//base/strings/escape.h", "//base/strings/latin1_string_conversions.cc", "//base/strings/latin1_string_conversions.h", "//base/strings/levenshtein_distance.cc", "//base/strings/levenshtein_distance.h", "//base/strings/pattern.cc", "//base/strings/pattern.h", "//base/strings/safe_sprintf.cc", "//base/strings/safe_sprintf.h", "//base/strings/strcat.cc", "//base/strings/strcat.h", "//base/strings/strcat_internal.h", "//base/strings/string_number_conversions.cc", "//base/strings/string_number_conversions.h", "//base/strings/string_number_conversions_internal.h", "//base/strings/string_piece.h", "//base/strings/string_split.cc", "//base/strings/string_split.h", "//base/strings/string_split_internal.h", "//base/strings/string_tokenizer.h", "//base/strings/string_util.cc", "//base/strings/string_util.h", "//base/strings/string_util_constants.cc", "//base/strings/string_util_impl_helpers.h", "//base/strings/string_util_internal.h", "//base/strings/stringize_macros.h", "//base/strings/stringprintf.cc", "//base/strings/stringprintf.h", "//base/strings/sys_string_conversions.h", "//base/strings/to_string.h", "//base/strings/utf_offset_string_conversions.cc", "//base/strings/utf_offset_string_conversions.h", "//base/strings/utf_ostream_operators.cc", "//base/strings/utf_ostream_operators.h", "//base/strings/utf_string_conversion_utils.cc", "//base/strings/utf_string_conversion_utils.h", "//base/strings/utf_string_conversions.cc", "//base/strings/utf_string_conversions.h", "//base/substring_set_matcher/matcher_string_pattern.cc", "//base/substring_set_matcher/matcher_string_pattern.h", "//base/substring_set_matcher/substring_set_matcher.cc", "//base/substring_set_matcher/substring_set_matcher.h", "//base/supports_user_data.cc", "//base/supports_user_data.h", "//base/synchronization/atomic_flag.cc", "//base/synchronization/atomic_flag.h", "//base/synchronization/condition_variable.h", "//base/synchronization/lock.cc", "//base/synchronization/lock.h", "//base/synchronization/lock_impl.h", "//base/synchronization/waitable_event.cc", "//base/synchronization/waitable_event.h", "//base/synchronization/waitable_event_watcher.h", "//base/sys_byteorder.h", "//base/syslog_logging.cc", "//base/syslog_logging.h", "//base/system/system_monitor.cc", "//base/system/system_monitor.h", "//base/task/bind_post_task.h", "//base/task/bind_post_task_internal.h", "//base/task/cancelable_task_tracker.cc", "//base/task/cancelable_task_tracker.h", "//base/task/common/checked_lock.h", "//base/task/common/checked_lock_impl.cc", "//base/task/common/checked_lock_impl.h", "//base/task/common/lazy_now.cc", "//base/task/common/lazy_now.h", "//base/task/common/operations_controller.cc", "//base/task/common/operations_controller.h", "//base/task/common/scoped_defer_task_posting.cc", "//base/task/common/scoped_defer_task_posting.h", "//base/task/common/task_annotator.cc", "//base/task/common/task_annotator.h", "//base/task/current_thread.cc", "//base/task/current_thread.h", "//base/task/default_delayed_task_handle_delegate.cc", "//base/task/default_delayed_task_handle_delegate.h", "//base/task/deferred_sequenced_task_runner.cc", "//base/task/deferred_sequenced_task_runner.h", "//base/task/delay_policy.h", "//base/task/delayed_task_handle.cc", "//base/task/delayed_task_handle.h", "//base/task/lazy_thread_pool_task_runner.cc", "//base/task/lazy_thread_pool_task_runner.h", "//base/task/post_job.cc", "//base/task/post_job.h", "//base/task/post_task_and_reply_with_result_internal.h", "//base/task/scoped_set_task_priority_for_current_thread.cc", "//base/task/scoped_set_task_priority_for_current_thread.h", "//base/task/sequence_manager/associated_thread_id.cc", "//base/task/sequence_manager/associated_thread_id.h", "//base/task/sequence_manager/atomic_flag_set.cc", "//base/task/sequence_manager/atomic_flag_set.h", "//base/task/sequence_manager/delayed_task_handle_delegate.cc", "//base/task/sequence_manager/delayed_task_handle_delegate.h", "//base/task/sequence_manager/enqueue_order.h", "//base/task/sequence_manager/enqueue_order_generator.cc", "//base/task/sequence_manager/enqueue_order_generator.h", "//base/task/sequence_manager/fence.cc", "//base/task/sequence_manager/fence.h", "//base/task/sequence_manager/lazily_deallocated_deque.h", "//base/task/sequence_manager/sequence_manager.cc", "//base/task/sequence_manager/sequence_manager.h", "//base/task/sequence_manager/sequence_manager_impl.cc", "//base/task/sequence_manager/sequence_manager_impl.h", "//base/task/sequence_manager/sequenced_task_source.cc", "//base/task/sequence_manager/sequenced_task_source.h", "//base/task/sequence_manager/task_order.cc", "//base/task/sequence_manager/task_order.h", "//base/task/sequence_manager/task_queue.cc", "//base/task/sequence_manager/task_queue.h", "//base/task/sequence_manager/task_queue_impl.cc", "//base/task/sequence_manager/task_queue_impl.h", "//base/task/sequence_manager/task_queue_selector.cc", "//base/task/sequence_manager/task_queue_selector.h", "//base/task/sequence_manager/task_time_observer.h", "//base/task/sequence_manager/tasks.cc", "//base/task/sequence_manager/tasks.h", "//base/task/sequence_manager/thread_controller.cc", "//base/task/sequence_manager/thread_controller.h", "//base/task/sequence_manager/thread_controller_impl.cc", "//base/task/sequence_manager/thread_controller_impl.h", "//base/task/sequence_manager/thread_controller_power_monitor.cc", "//base/task/sequence_manager/thread_controller_power_monitor.h", "//base/task/sequence_manager/thread_controller_with_message_pump_impl.cc", "//base/task/sequence_manager/thread_controller_with_message_pump_impl.h", "//base/task/sequence_manager/time_domain.cc", "//base/task/sequence_manager/time_domain.h", "//base/task/sequence_manager/wake_up_queue.cc", "//base/task/sequence_manager/wake_up_queue.h", "//base/task/sequence_manager/work_deduplicator.cc", "//base/task/sequence_manager/work_deduplicator.h", "//base/task/sequence_manager/work_queue.cc", "//base/task/sequence_manager/work_queue.h", "//base/task/sequence_manager/work_queue_sets.cc", "//base/task/sequence_manager/work_queue_sets.h", "//base/task/sequenced_task_runner.cc", "//base/task/sequenced_task_runner.h", "//base/task/sequenced_task_runner_helpers.h", "//base/task/single_thread_task_executor.cc", "//base/task/single_thread_task_executor.h", "//base/task/single_thread_task_runner.cc", "//base/task/single_thread_task_runner.h", "//base/task/single_thread_task_runner_thread_mode.h", "//base/task/task_features.cc", "//base/task/task_features.h", "//base/task/task_observer.h", "//base/task/task_runner.cc", "//base/task/task_runner.h", "//base/task/task_traits.cc", "//base/task/task_traits.h", "//base/task/thread_pool.cc", "//base/task/thread_pool.h", "//base/task/thread_pool/delayed_priority_queue.cc", "//base/task/thread_pool/delayed_priority_queue.h", "//base/task/thread_pool/delayed_task_manager.cc", "//base/task/thread_pool/delayed_task_manager.h", "//base/task/thread_pool/environment_config.cc", "//base/task/thread_pool/environment_config.h", "//base/task/thread_pool/job_task_source.cc", "//base/task/thread_pool/job_task_source.h", "//base/task/thread_pool/job_task_source_interface.h", "//base/task/thread_pool/job_task_source_old.cc", "//base/task/thread_pool/job_task_source_old.h", "//base/task/thread_pool/pooled_parallel_task_runner.cc", "//base/task/thread_pool/pooled_parallel_task_runner.h", "//base/task/thread_pool/pooled_sequenced_task_runner.cc", "//base/task/thread_pool/pooled_sequenced_task_runner.h", "//base/task/thread_pool/pooled_single_thread_task_runner_manager.cc", "//base/task/thread_pool/pooled_single_thread_task_runner_manager.h", "//base/task/thread_pool/pooled_task_runner_delegate.cc", "//base/task/thread_pool/pooled_task_runner_delegate.h", "//base/task/thread_pool/priority_queue.cc", "//base/task/thread_pool/priority_queue.h", "//base/task/thread_pool/semaphore.h", "//base/task/thread_pool/sequence.cc", "//base/task/thread_pool/sequence.h", "//base/task/thread_pool/service_thread.cc", "//base/task/thread_pool/service_thread.h", "//base/task/thread_pool/task.cc", "//base/task/thread_pool/task.h", "//base/task/thread_pool/task_source.cc", "//base/task/thread_pool/task_source.h", "//base/task/thread_pool/task_source_sort_key.cc", "//base/task/thread_pool/task_source_sort_key.h", "//base/task/thread_pool/task_tracker.cc", "//base/task/thread_pool/task_tracker.h", "//base/task/thread_pool/thread_group.cc", "//base/task/thread_pool/thread_group.h", "//base/task/thread_pool/thread_group_impl.cc", "//base/task/thread_pool/thread_group_impl.h", "//base/task/thread_pool/thread_pool_impl.cc", "//base/task/thread_pool/thread_pool_impl.h", "//base/task/thread_pool/thread_pool_instance.cc", "//base/task/thread_pool/thread_pool_instance.h", "//base/task/thread_pool/tracked_ref.h", "//base/task/thread_pool/worker_thread.cc", "//base/task/thread_pool/worker_thread.h", "//base/task/thread_pool/worker_thread_observer.h", "//base/task/thread_pool/worker_thread_set.cc", "//base/task/thread_pool/worker_thread_set.h", "//base/task/thread_pool/worker_thread_waitable_event.cc", "//base/task/thread_pool/worker_thread_waitable_event.h", "//base/task/updateable_sequenced_task_runner.h", "//base/template_util.h", "//base/test/scoped_logging_settings.h", "//base/test/spin_wait.h", "//base/third_party/cityhash/city.cc", "//base/third_party/cityhash/city.h", "//base/third_party/cityhash_v103/src/city_v103.cc", "//base/third_party/cityhash_v103/src/city_v103.h", "//base/third_party/icu/icu_utf.h", "//base/third_party/nspr/prtime.cc", "//base/third_party/nspr/prtime.h", "//base/third_party/superfasthash/superfasthash.c", "//base/thread_annotations.h", "//base/threading/hang_watcher.cc", "//base/threading/hang_watcher.h", "//base/threading/platform_thread.cc", "//base/threading/platform_thread.h", "//base/threading/platform_thread_ref.cc", "//base/threading/platform_thread_ref.h", "//base/threading/post_task_and_reply_impl.cc", "//base/threading/post_task_and_reply_impl.h", "//base/threading/scoped_blocking_call.cc", "//base/threading/scoped_blocking_call.h", "//base/threading/scoped_blocking_call_internal.cc", "//base/threading/scoped_blocking_call_internal.h", "//base/threading/scoped_thread_priority.cc", "//base/threading/scoped_thread_priority.h", "//base/threading/sequence_bound.h", "//base/threading/sequence_bound_internal.h", "//base/threading/sequence_local_storage_map.cc", "//base/threading/sequence_local_storage_map.h", "//base/threading/sequence_local_storage_slot.cc", "//base/threading/sequence_local_storage_slot.h", "//base/threading/simple_thread.cc", "//base/threading/simple_thread.h", "//base/threading/thread.cc", "//base/threading/thread.h", "//base/threading/thread_checker.cc", "//base/threading/thread_checker.h", "//base/threading/thread_checker_impl.cc", "//base/threading/thread_checker_impl.h", "//base/threading/thread_collision_warner.cc", "//base/threading/thread_collision_warner.h", "//base/threading/thread_id_name_manager.cc", "//base/threading/thread_id_name_manager.h", "//base/threading/thread_local.h", "//base/threading/thread_local_internal.h", "//base/threading/thread_local_storage.cc", "//base/threading/thread_local_storage.h", "//base/threading/thread_restrictions.cc", "//base/threading/thread_restrictions.h", "//base/threading/threading_features.h", "//base/threading/watchdog.cc", "//base/threading/watchdog.h", "//base/time/clock.cc", "//base/time/clock.h", "//base/time/default_clock.cc", "//base/time/default_clock.h", "//base/time/default_tick_clock.cc", "//base/time/default_tick_clock.h", "//base/time/tick_clock.cc", "//base/time/tick_clock.h", "//base/time/time.cc", "//base/time/time.h", "//base/time/time_delta_from_string.cc", "//base/time/time_delta_from_string.h", "//base/time/time_override.cc", "//base/time/time_override.h", "//base/timer/elapsed_timer.cc", "//base/timer/elapsed_timer.h", "//base/timer/hi_res_timer_manager.h", "//base/timer/lap_timer.cc", "//base/timer/lap_timer.h", "//base/timer/timer.cc", "//base/timer/timer.h", "//base/timer/wall_clock_timer.cc", "//base/timer/wall_clock_timer.h", "//base/token.cc", "//base/token.h", "//base/trace_event/base_tracing.h", "//base/trace_event/base_tracing_forward.h", "//base/trace_event/common/trace_event_common.h", "//base/trace_event/heap_profiler_allocation_context.cc", "//base/trace_event/heap_profiler_allocation_context.h", "//base/trace_event/heap_profiler_allocation_context_tracker.cc", "//base/trace_event/heap_profiler_allocation_context_tracker.h", "//base/trace_event/memory_allocator_dump_guid.cc", "//base/trace_event/memory_allocator_dump_guid.h", "//base/trace_event/trace_id_helper.cc", "//base/trace_event/trace_id_helper.h", "//base/traits_bag.h", "//base/tuple.h", "//base/types/always_false.h", "//base/types/cxx23_to_underlying.h", "//base/types/expected.h", "//base/types/expected_internal.h", "//base/types/expected_macros.h", "//base/types/fixed_array.h", "//base/types/id_type.h", "//base/types/is_instantiation.h", "//base/types/optional_ref.h", "//base/types/optional_util.h", "//base/types/pass_key.h", "//base/types/strong_alias.h", "//base/types/supports_ostream_operator.h", "//base/types/token_type.h", "//base/types/variant_util.h", "//base/unguessable_token.cc", "//base/unguessable_token.h", "//base/uuid.cc", "//base/uuid.h", "//base/value_iterators.cc", "//base/value_iterators.h", "//base/values.cc", "//base/values.h", "//base/version.cc", "//base/version.h", "//base/vlog.cc", "//base/vlog.h", "//base/debug/debugger_posix.cc", "//base/file_descriptor_posix.cc", "//base/file_descriptor_posix.h", "//base/files/dir_reader_posix.h", "//base/files/file_posix.cc", "//base/files/memory_mapped_file_posix.cc", "//base/message_loop/watchable_io_message_pump_posix.cc", "//base/message_loop/watchable_io_message_pump_posix.h", "//base/posix/eintr_wrapper.h", "//base/posix/file_descriptor_shuffle.cc", "//base/posix/file_descriptor_shuffle.h", "//base/posix/global_descriptors.cc", "//base/posix/global_descriptors.h", "//base/posix/safe_strerror.cc", "//base/posix/safe_strerror.h", "//base/process/process_handle_posix.cc", "//base/strings/string_util_posix.h", "//base/synchronization/condition_variable_posix.cc", "//base/synchronization/lock_impl_posix.cc", "//base/threading/platform_thread_posix.cc", "//base/threading/thread_local_storage_posix.cc", "//base/time/time_conversion_posix.cc", "//base/timer/hi_res_timer_manager_posix.cc", "//base/debug/proc_maps_linux.cc", "//base/debug/proc_maps_linux.h", "//base/files/dir_reader_linux.h", "//base/files/scoped_file_linux.cc", "//base/process/internal_linux.cc", "//base/process/internal_linux.h", "//base/process/memory_linux.cc", "//base/process/process_handle_linux.cc", "//base/process/process_iterator_linux.cc", "//base/process/process_linux.cc", "//base/process/process_metrics_linux.cc", "//base/threading/platform_thread_linux.cc", "//base/threading/platform_thread_linux_base.cc", "//base/threading/thread_type_delegate.cc", "//base/threading/thread_type_delegate.h", "//base/files/file_path_watcher_inotify.cc", "//base/files/file_path_watcher_inotify.h", "//base/hash/md5.h", "//base/hash/md5_constexpr.h", "//base/hash/md5_constexpr_internal.h", "//base/hash/sha1.h", "//base/hash/md5_boringssl.cc", "//base/hash/md5_boringssl.h", "//base/hash/sha1_boringssl.cc", "//base/hash/sha1_boringssl.h", "//base/base_paths.cc", "//base/base_paths.h", "//base/cpu.cc", "//base/cpu.h", "//base/debug/crash_logging.cc", "//base/debug/crash_logging.h", "//base/debug/stack_trace.cc", "//base/debug/stack_trace.h", "//base/files/file_enumerator.cc", "//base/files/file_enumerator.h", "//base/files/file_proxy.cc", "//base/files/file_proxy.h", "//base/files/file_util.cc", "//base/files/file_util.h", "//base/files/important_file_writer.cc", "//base/files/important_file_writer.h", "//base/files/important_file_writer_cleaner.cc", "//base/files/important_file_writer_cleaner.h", "//base/files/scoped_temp_dir.cc", "//base/files/scoped_temp_dir.h", "//base/files/scoped_temp_file.cc", "//base/files/scoped_temp_file.h", "//base/json/json_file_value_serializer.cc", "//base/json/json_file_value_serializer.h", "//base/memory/discardable_memory.cc", "//base/memory/discardable_memory.h", "//base/memory/discardable_memory_allocator.cc", "//base/memory/discardable_memory_allocator.h", "//base/memory/discardable_memory_internal.h", "//base/metrics/persistent_histogram_storage.cc", "//base/metrics/persistent_histogram_storage.h", "//base/native_library.cc", "//base/native_library.h", "//base/path_service.cc", "//base/path_service.h", "//base/process/process_metrics.cc", "//base/process/process_metrics.h", "//base/scoped_native_library.cc", "//base/scoped_native_library.h", "//base/system/sys_info.cc", "//base/system/sys_info.h", "//base/system/sys_info_internal.h", "//base/task/thread_pool/initialization_util.cc", "//base/task/thread_pool/initialization_util.h", "//base/task/thread_pool/semaphore/semaphore_posix.cc", "//base/base_paths_posix.h", "//base/memory/madv_free_discardable_memory_allocator_posix.cc", "//base/memory/madv_free_discardable_memory_allocator_posix.h", "//base/memory/madv_free_discardable_memory_posix.cc", "//base/memory/madv_free_discardable_memory_posix.h", "//base/posix/unix_domain_socket.cc", "//base/posix/unix_domain_socket.h", "//base/rand_util_posix.cc", "//base/system/sys_info_posix.cc", "//base/files/file_descriptor_watcher_posix.cc", "//base/files/file_descriptor_watcher_posix.h", "//base/files/file_enumerator_posix.cc", "//base/files/file_util_posix.cc", "//base/memory/page_size_posix.cc", "//base/process/process_metrics_posix.cc", "//base/sync_socket_posix.cc", "//base/native_library_posix.cc", "//base/posix/can_lower_nice_to.cc", "//base/posix/can_lower_nice_to.h", "//base/process/launch_posix.cc", "//base/profiler/module_cache_posix.cc", "//base/profiler/stack_base_address_posix.cc", "//base/profiler/stack_base_address_posix.h", "//base/profiler/stack_copier_signal.cc", "//base/profiler/stack_copier_signal.h", "//base/profiler/thread_delegate_posix.cc", "//base/profiler/thread_delegate_posix.h", "//base/debug/stack_trace_posix.cc", "//base/process/process_posix.cc", "//base/memory/discardable_shared_memory.cc", "//base/memory/discardable_shared_memory.h", "//base/process/kill.cc", "//base/process/kill.h", "//base/process/launch.cc", "//base/process/launch.h", "//base/process/memory.cc", "//base/process/memory.h", "//base/process/process_iterator.cc", "//base/process/process_iterator.h", "//base/process/kill_posix.cc", "//base/base_paths_posix.cc", "//base/debug/elf_reader.cc", "//base/debug/elf_reader.h", "//base/stack_canary_linux.cc", "//base/stack_canary_linux.h", "//base/file_descriptor_store.cc", "//base/file_descriptor_store.h", "//base/system/sys_info_linux.cc", "//base/files/file_path_watcher.cc", "//base/files/file_path_watcher.h", "//base/sync_socket.cc", "//base/sync_socket.h", "//base/message_loop/message_pump_libevent.cc", "//base/message_loop/message_pump_libevent.h", "//base/message_loop/message_pump_epoll.cc", "//base/message_loop/message_pump_epoll.h", "//base/memory/platform_shared_memory_mapper_posix.cc", "//base/memory/platform_shared_memory_region_posix.cc", "//base/strings/sys_string_conversions_posix.cc", "//base/synchronization/waitable_event_posix.cc", "//base/synchronization/waitable_event_watcher_posix.cc", "//base/threading/platform_thread_internal_posix.cc", "//base/threading/platform_thread_internal_posix.h", "//base/time/time_exploded_posix.cc", "//base/time/time_now_posix.cc", "//base/time/time_exploded_icu.cc", "//base/profiler/stack_sampler_posix.cc", "//base/power_monitor/power_monitor_device_source_stub.cc", "//base/trace_event/trace_event_stub.cc", "//base/trace_event/trace_event_stub.h" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/linux:clang_x64",
@@ -1891,6 +1915,7 @@
       "metadata": {
          "all_deps": [ "//base:base", "//base:i18n", "//base/test:test_support", "//base/test:test_support_perf", "//testing/gtest:gtest", "//base/test:test_support_java", "//build/android/gtest_apk:native_test_instrumentation_test_runner_java", "//testing/android/native_test:native_test_java", "//base:base_i18n_perftests__apk__secondary_abi_shared_library_list", "//base:base_i18n_perftests__apk__shared_library_list", "//base:base_i18n_perftests__library__jni_registration", "//base:base_i18n_perftests__apk__compile_resources", "//base:base_i18n_perftests__apk__native_libraries", "//base:base_i18n_perftests__apk__build_config_srcjar" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [  ],
          "target_type": [ "android_apk" ]
       },
@@ -2038,20 +2063,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/android:hide_all_but_jni", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config", "//base/test:perf_test_config", "//build/config/sanitizers:link_shared_library" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST", "PERF_TEST" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/android:hide_all_but_jni", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config", "//base/test:perf_test_config", "//build/config/sanitizers:link_shared_library" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST", "PERF_TEST" ],
       "deps": [ "//base:base", "//base:i18n", "//base/test:test_support", "//base/test:test_support_perf", "//build/config:shared_library_deps", "//testing/android/native_test:native_test_native_code", "//testing/gtest:gtest" ],
       "externs": {
 
       },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/" ],
-      "ldflags": [ "-LinkWrapper,add-whole-archive=base.rlib", "-LinkWrapper,add-whole-archive=i18n.rlib", "-LinkWrapper,add-whole-archive=test_support.rlib", "-LinkWrapper,add-whole-archive=test_support_perf.rlib", "-LinkWrapper,add-whole-archive=gtest.rlib", "-LinkWrapper,add-whole-archive=native_test_native_code.rlib", "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../build/android/android_only_jni_exports.lst", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/re2/src/" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../build/android/android_only_jni_exports.lst", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "dl", "m", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
          "shared_libraries": [ "//out/cronet/libbase_i18n_perftests__library.so" ]
@@ -2145,11 +2170,12 @@
       "visibility": [ "*" ]
    },
    "//base:base_java": {
-      "deps": [ "//base:base_java__assetres", "//base:base_java__dex", "//base:base_java__process_device", "//base:base_java__validate", "//base:jni_java", "//build/android:build_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java" ],
+      "deps": [ "//base:base_java__assetres", "//base:base_java__dex", "//base:base_java__process_device", "//base:base_java__validate", "//build/android:build_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java" ],
       "metadata": {
-         "all_deps": [ "//base:jni_java", "//build/android:build_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java", "//base:base_android_java_enums_srcjar", "//base:base_jni", "//base:java_features_srcjar", "//base:java_switches_srcjar" ],
+         "all_deps": [ "//build/android:build_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java", "//base:base_android_java_enums_srcjar", "//base:base_jni", "//base:java_features_srcjar", "//base:java_switches_srcjar" ],
          "jar_path": [ "" ],
-         "source_files": [ "//base/android/java/src/org/chromium/base/ActivityState.java", "//base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java", "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CallbackController.java", "//base/android/java/src/org/chromium/base/CollectionUtil.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/CommandLineInitUtil.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/ContextUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/DiscardableReferencePool.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/Flag.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/IntentUtils.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/LifetimeAssert.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/Log.java", "//base/android/java/src/org/chromium/base/MathUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/ObserverList.java", "//base/android/java/src/org/chromium/base/PackageManagerUtils.java", "//base/android/java/src/org/chromium/base/PackageUtils.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PiiElider.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/PowerMonitorForQ.java", "//base/android/java/src/org/chromium/base/Promise.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/RequiredCallback.java", "//base/android/java/src/org/chromium/base/ResettersForTesting.java", "//base/android/java/src/org/chromium/base/StreamUtil.java", "//base/android/java/src/org/chromium/base/StrictModeContext.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimeUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/UnownedUserData.java", "//base/android/java/src/org/chromium/base/UnownedUserDataHost.java", "//base/android/java/src/org/chromium/base/UnownedUserDataKey.java", "//base/android/java/src/org/chromium/base/UserData.java", "//base/android/java/src/org/chromium/base/UserDataHost.java", "//base/android/java/src/org/chromium/base/WrappedClassLoader.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForM.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForN.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForO.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForOMR1.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForP.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForQ.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForR.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForS.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsListener.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsStore.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankActivityTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankEndScenarioTime.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetrics.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingRunnable.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingScheduler.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankScenario.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerStateController.java", "//base/android/java/src/org/chromium/base/jank_tracker/PlaceholderJankTracker.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/library_loader/Linker.java", "//base/android/java/src/org/chromium/base/library_loader/LinkerJni.java", "//base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java", "//base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java", "//base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java", "//base/android/java/src/org/chromium/base/lifetime/DestroyChecker.java", "//base/android/java/src/org/chromium/base/lifetime/Destroyable.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java", "//base/android/java/src/org/chromium/base/memory/MemoryPurgeManager.java", "//base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/HistogramBucket.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/NoopUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/RecordHistogram.java", "//base/android/java/src/org/chromium/base/metrics/RecordUserAction.java", "//base/android/java/src/org/chromium/base/metrics/ScopedSysTraceEvent.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/metrics/TimingMetric.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java", "//base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/OneShotCallback.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/Supplier.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/UnownedUserDataSupplier.java", "//base/android/java/src/org/chromium/base/task/AsyncTask.java", "//base/android/java/src/org/chromium/base/task/BackgroundOnlyAsyncTask.java", "//base/android/java/src/org/chromium/base/task/ChainedTasks.java", "//base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/SerialExecutor.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/TaskExecutor.java", "//base/android/java/src/org/chromium/base/task/TaskRunner.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java", "//base/android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java", "//base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java" ],
+         "sdk_version": [ "current" ],
+         "source_files": [ "//base/android/java/src/org/chromium/base/ActivityState.java", "//base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java", "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CallbackController.java", "//base/android/java/src/org/chromium/base/CollectionUtil.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/CommandLineInitUtil.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/ContextUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/DiscardableReferencePool.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/Flag.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/IntentUtils.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/JniAndroid.java", "//base/android/java/src/org/chromium/base/LifetimeAssert.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/Log.java", "//base/android/java/src/org/chromium/base/MathUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/MutableFlagWithSafeDefault.java", "//base/android/java/src/org/chromium/base/ObserverList.java", "//base/android/java/src/org/chromium/base/PackageManagerUtils.java", "//base/android/java/src/org/chromium/base/PackageUtils.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PiiElider.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/PowerMonitorForQ.java", "//base/android/java/src/org/chromium/base/Promise.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/RequiredCallback.java", "//base/android/java/src/org/chromium/base/ResettersForTesting.java", "//base/android/java/src/org/chromium/base/StreamUtil.java", "//base/android/java/src/org/chromium/base/StrictModeContext.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimeUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/UnownedUserData.java", "//base/android/java/src/org/chromium/base/UnownedUserDataHost.java", "//base/android/java/src/org/chromium/base/UnownedUserDataKey.java", "//base/android/java/src/org/chromium/base/UserData.java", "//base/android/java/src/org/chromium/base/UserDataHost.java", "//base/android/java/src/org/chromium/base/WrappedClassLoader.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForM.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForN.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForO.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForOMR1.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForP.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForQ.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForR.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForS.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsListener.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsStore.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankActivityTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankEndScenarioTime.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetrics.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingRunnable.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingScheduler.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankScenario.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerStateController.java", "//base/android/java/src/org/chromium/base/jank_tracker/PlaceholderJankTracker.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/library_loader/Linker.java", "//base/android/java/src/org/chromium/base/library_loader/LinkerJni.java", "//base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java", "//base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java", "//base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java", "//base/android/java/src/org/chromium/base/lifetime/DestroyChecker.java", "//base/android/java/src/org/chromium/base/lifetime/Destroyable.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java", "//base/android/java/src/org/chromium/base/memory/MemoryPurgeManager.java", "//base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/HistogramBucket.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/NoopUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/RecordHistogram.java", "//base/android/java/src/org/chromium/base/metrics/RecordUserAction.java", "//base/android/java/src/org/chromium/base/metrics/ScopedSysTraceEvent.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/metrics/TimingMetric.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java", "//base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/OneShotCallback.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/Supplier.java", "//base/android/java/src/org/chromium/base/supplier/SupplierUtils.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/UnownedUserDataSupplier.java", "//base/android/java/src/org/chromium/base/task/AsyncTask.java", "//base/android/java/src/org/chromium/base/task/BackgroundOnlyAsyncTask.java", "//base/android/java/src/org/chromium/base/task/ChainedTasks.java", "//base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/SerialExecutor.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/TaskExecutor.java", "//base/android/java/src/org/chromium/base/task/TaskRunner.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java", "//base/android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java", "//base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java" ],
          "target_type": [ "java_library" ]
       },
       "public": "*",
@@ -2161,7 +2187,7 @@
    "//base:base_java__assetres": {
       "args": [ "--depfile", "gen/base/base_java__assetres.d", "--srcjar-out", "gen/base/base_java__assetres.srcjar", "--deps-rtxts=@FileArg(gen/base/base_java.build_config.json:deps_info:dependency_r_txt_files)", "--r-package=org.chromium.base" ],
       "depfile": "//out/cronet/gen/base/base_java__assetres.d",
-      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:jni_java__assetres", "//build/android:build_java__assetres", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__assetres", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__assetres", "//third_party/androidx:androidx_annotation_annotation_experimental_java__assetres", "//third_party/androidx:androidx_annotation_annotation_java__assetres", "//third_party/jni_zero:jni_zero_java__assetres" ],
+      "deps": [ "//base:base_java__build_config_crbug_908819", "//build/android:build_java__assetres", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__assetres", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__assetres", "//third_party/androidx:androidx_annotation_annotation_experimental_java__assetres", "//third_party/androidx:androidx_annotation_annotation_java__assetres", "//third_party/jni_zero:jni_zero_java__assetres" ],
       "inputs": [ "//out/cronet/gen/base/base_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/create_r_java.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py" ],
       "metadata": {
 
@@ -2175,10 +2201,10 @@
       "visibility": [ "*" ]
    },
    "//base:base_java__build_config_crbug_908819": {
-      "args": [ "--type=java_library", "--depfile", "gen/base/base_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/base/jni_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json\", \"gen/third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_experimental_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/base/base_java.build_config.json", "--gn-target", "//base:base_java", "--device-jar-path", "obj/base/base_java.processed.jar", "--host-jar-path", "lib.java/base/base_java.jar", "--unprocessed-jar-path", "obj/base/base_java.javac.jar", "--interface-jar-path", "obj/base/base_java.turbine.jar", "--dex-path", "obj/base/base_java.dex.jar", "--supports-android", "--requires-android", "--package-name", "org.chromium.base", "--target-sources-file", "gen/base/base_java.sources", "--bundled-srcjars=[\"gen/base/base_android_java_enums_srcjar.srcjar\", \"gen/base/base_jni.srcjar\", \"gen/base/java_features_srcjar.srcjar\", \"gen/base/java_switches_srcjar.srcjar\"]", "--proguard-configs=[\"../../base/android/proguard/chromium_apk.flags\", \"../../base/android/proguard/chromium_code.flags\", \"../../base/android/proguard/remove_logging.flags\"]" ],
+      "args": [ "--type=java_library", "--depfile", "gen/base/base_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json\", \"gen/third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_experimental_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/base/base_java.build_config.json", "--gn-target", "//base:base_java", "--device-jar-path", "obj/base/base_java.processed.jar", "--host-jar-path", "lib.java/base/base_java.jar", "--unprocessed-jar-path", "obj/base/base_java.javac.jar", "--interface-jar-path", "obj/base/base_java.turbine.jar", "--dex-path", "obj/base/base_java.dex.jar", "--supports-android", "--requires-android", "--package-name", "org.chromium.base", "--target-sources-file", "gen/base/base_java.sources", "--bundled-srcjars=[\"gen/base/base_android_java_enums_srcjar.srcjar\", \"gen/base/base_jni.srcjar\", \"gen/base/java_features_srcjar.srcjar\", \"gen/base/java_switches_srcjar.srcjar\"]", "--proguard-configs=[\"../../base/android/proguard/chromium_code.flags\"]" ],
       "depfile": "//out/cronet/gen/base/base_java__build_config_crbug_908819.d",
-      "deps": [ "//base:jni_java__build_config_crbug_908819", "//build/android:build_java__build_config_crbug_908819", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__build_config_crbug_908819", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_experimental_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819", "//third_party/jni_zero:jni_zero_java__build_config_crbug_908819" ],
-      "inputs": [ "//out/cronet/gen/base/jni_java.build_config.json", "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json", "//out/cronet/gen/third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_experimental_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/third_party/jni_zero/jni_zero_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
+      "deps": [ "//build/android:build_java__build_config_crbug_908819", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__build_config_crbug_908819", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_experimental_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819", "//third_party/jni_zero:jni_zero_java__build_config_crbug_908819" ],
+      "inputs": [ "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json", "//out/cronet/gen/third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_experimental_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/third_party/jni_zero/jni_zero_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
       "metadata": {
 
       },
@@ -2193,8 +2219,9 @@
    "//base:base_java__compile_java": {
       "args": [ "--depfile=gen/base/base_java__compile_java.d", "--generated-dir=gen/base/base_java/generated_java", "--jar-path=obj/base/base_java.javac.jar", "--java-srcjars=[\"gen/base/base_android_java_enums_srcjar.srcjar\", \"gen/base/base_jni.srcjar\", \"gen/base/java_features_srcjar.srcjar\", \"gen/base/java_switches_srcjar.srcjar\", \"gen/base/base_java__assetres.srcjar\", \"gen/base/base_java.generated.srcjar\"]", "--target-name", "//base:base_java__compile_java", "--classpath=@FileArg(gen/base/base_java.build_config.json:android:sdk_interface_jars)", "--header-jar", "obj/base/base_java.turbine.jar", "--classpath=[\"obj/base/base_java.turbine.jar\"]", "--classpath=@FileArg(gen/base/base_java.build_config.json:deps_info:javac_full_interface_classpath)", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/base/base_java.sources" ],
       "depfile": "//out/cronet/gen/base/base_java__compile_java.d",
-      "deps": [ "//base:base_android_java_enums_srcjar", "//base:base_java__assetres", "//base:base_java__build_config_crbug_908819", "//base:base_java__header", "//base:base_jni", "//base:java_features_srcjar", "//base:java_switches_srcjar", "//base:jni_java__header", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
-      "inputs": [ "//base/android/java/src/org/chromium/base/ActivityState.java", "//base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java", "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CallbackController.java", "//base/android/java/src/org/chromium/base/CollectionUtil.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/CommandLineInitUtil.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/ContextUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/DiscardableReferencePool.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/Flag.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/IntentUtils.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/LifetimeAssert.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/Log.java", "//base/android/java/src/org/chromium/base/MathUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/ObserverList.java", "//base/android/java/src/org/chromium/base/PackageManagerUtils.java", "//base/android/java/src/org/chromium/base/PackageUtils.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PiiElider.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/PowerMonitorForQ.java", "//base/android/java/src/org/chromium/base/Promise.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/RequiredCallback.java", "//base/android/java/src/org/chromium/base/ResettersForTesting.java", "//base/android/java/src/org/chromium/base/StreamUtil.java", "//base/android/java/src/org/chromium/base/StrictModeContext.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimeUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/UnownedUserData.java", "//base/android/java/src/org/chromium/base/UnownedUserDataHost.java", "//base/android/java/src/org/chromium/base/UnownedUserDataKey.java", "//base/android/java/src/org/chromium/base/UserData.java", "//base/android/java/src/org/chromium/base/UserDataHost.java", "//base/android/java/src/org/chromium/base/WrappedClassLoader.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForM.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForN.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForO.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForOMR1.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForP.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForQ.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForR.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForS.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsListener.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsStore.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankActivityTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankEndScenarioTime.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetrics.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingRunnable.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingScheduler.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankScenario.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerStateController.java", "//base/android/java/src/org/chromium/base/jank_tracker/PlaceholderJankTracker.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/library_loader/Linker.java", "//base/android/java/src/org/chromium/base/library_loader/LinkerJni.java", "//base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java", "//base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java", "//base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java", "//base/android/java/src/org/chromium/base/lifetime/DestroyChecker.java", "//base/android/java/src/org/chromium/base/lifetime/Destroyable.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java", "//base/android/java/src/org/chromium/base/memory/MemoryPurgeManager.java", "//base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/HistogramBucket.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/NoopUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/RecordHistogram.java", "//base/android/java/src/org/chromium/base/metrics/RecordUserAction.java", "//base/android/java/src/org/chromium/base/metrics/ScopedSysTraceEvent.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/metrics/TimingMetric.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java", "//base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/OneShotCallback.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/Supplier.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/UnownedUserDataSupplier.java", "//base/android/java/src/org/chromium/base/task/AsyncTask.java", "//base/android/java/src/org/chromium/base/task/BackgroundOnlyAsyncTask.java", "//base/android/java/src/org/chromium/base/task/ChainedTasks.java", "//base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/SerialExecutor.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/TaskExecutor.java", "//base/android/java/src/org/chromium/base/task/TaskRunner.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java", "//base/android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java", "//base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java", "//out/cronet/gen/base/base_android_java_enums_srcjar.srcjar", "//out/cronet/gen/base/base_jni.srcjar", "//out/cronet/gen/base/java_features_srcjar.srcjar", "//out/cronet/gen/base/java_switches_srcjar.srcjar", "//out/cronet/gen/base/base_java__assetres.srcjar", "//out/cronet/gen/base/base_java.generated.srcjar", "//out/cronet/gen/base/base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_java.sources", "//out/cronet/obj/base/base_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "deps": [ "//base:base_android_java_enums_srcjar", "//base:base_java__assetres", "//base:base_java__build_config_crbug_908819", "//base:base_java__header", "//base:base_jni", "//base:java_features_srcjar", "//base:java_switches_srcjar", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
+      "inputs": [ "//base/android/java/src/org/chromium/base/ActivityState.java", "//base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java", "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CallbackController.java", "//base/android/java/src/org/chromium/base/CollectionUtil.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/CommandLineInitUtil.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/ContextUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/DiscardableReferencePool.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/Flag.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/IntentUtils.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/JniAndroid.java", "//base/android/java/src/org/chromium/base/LifetimeAssert.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/Log.java", "//base/android/java/src/org/chromium/base/MathUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/MutableFlagWithSafeDefault.java", "//base/android/java/src/org/chromium/base/ObserverList.java", "//base/android/java/src/org/chromium/base/PackageManagerUtils.java", "//base/android/java/src/org/chromium/base/PackageUtils.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PiiElider.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/PowerMonitorForQ.java", "//base/android/java/src/org/chromium/base/Promise.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/RequiredCallback.java", "//base/android/java/src/org/chromium/base/ResettersForTesting.java", "//base/android/java/src/org/chromium/base/StreamUtil.java", "//base/android/java/src/org/chromium/base/StrictModeContext.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimeUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/UnownedUserData.java", "//base/android/java/src/org/chromium/base/UnownedUserDataHost.java", "//base/android/java/src/org/chromium/base/UnownedUserDataKey.java", "//base/android/java/src/org/chromium/base/UserData.java", "//base/android/java/src/org/chromium/base/UserDataHost.java", "//base/android/java/src/org/chromium/base/WrappedClassLoader.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForM.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForN.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForO.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForOMR1.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForP.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForQ.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForR.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForS.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsListener.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsStore.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankActivityTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankEndScenarioTime.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetrics.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingRunnable.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingScheduler.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankScenario.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerStateController.java", "//base/android/java/src/org/chromium/base/jank_tracker/PlaceholderJankTracker.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/library_loader/Linker.java", "//base/android/java/src/org/chromium/base/library_loader/LinkerJni.java", "//base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java", "//base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java", "//base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java", "//base/android/java/src/org/chromium/base/lifetime/DestroyChecker.java", "//base/android/java/src/org/chromium/base/lifetime/Destroyable.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java", "//base/android/java/src/org/chromium/base/memory/MemoryPurgeManager.java", "//base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/HistogramBucket.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/NoopUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/RecordHistogram.java", "//base/android/java/src/org/chromium/base/metrics/RecordUserAction.java", "//base/android/java/src/org/chromium/base/metrics/ScopedSysTraceEvent.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/metrics/TimingMetric.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java", "//base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/OneShotCallback.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/Supplier.java", "//base/android/java/src/org/chromium/base/supplier/SupplierUtils.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/UnownedUserDataSupplier.java", "//base/android/java/src/org/chromium/base/task/AsyncTask.java", "//base/android/java/src/org/chromium/base/task/BackgroundOnlyAsyncTask.java", "//base/android/java/src/org/chromium/base/task/ChainedTasks.java", "//base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/SerialExecutor.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/TaskExecutor.java", "//base/android/java/src/org/chromium/base/task/TaskRunner.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java", "//base/android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java", "//base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java", "//out/cronet/gen/base/base_android_java_enums_srcjar.srcjar", "//out/cronet/gen/base/base_jni.srcjar", "//out/cronet/gen/base/java_features_srcjar.srcjar", "//out/cronet/gen/base/java_switches_srcjar.srcjar", "//out/cronet/gen/base/base_java__assetres.srcjar", "//out/cronet/gen/base/base_java.generated.srcjar", "//out/cronet/gen/base/base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_java.sources", "//out/cronet/obj/base/base_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -2209,7 +2236,7 @@
    "//base:base_java__dex": {
       "args": [ "--depfile", "gen/base/base_java__dex.d", "--output", "obj/base/base_java.dex.jar", "--min-api=21", "--r8-jar-path", "../../third_party/r8/d8/lib/r8.jar", "--custom-d8-jar-path", "../../third_party/r8/custom_d8.jar", "--warnings-as-errors", "--incremental-dir", "obj/base/base_java__dex", "--library", "--class-inputs=[\"obj/base/base_java.processed.jar\"]", "--desugar", "--classpath", "obj/base/base_java.javac.jar", "--classpath=@FileArg(gen/base/base_java.build_config.json:deps_info:javac_full_interface_classpath)", "--desugar-dependencies", "gen/base/base_java__dex.desugardeps", "--bootclasspath=@FileArg(gen/base/base_java.build_config.json:android:sdk_jars)" ],
       "depfile": "//out/cronet/gen/base/base_java__dex.d",
-      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:base_java__compile_java", "//base:base_java__process_device", "//base:jni_java__header", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
+      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:base_java__compile_java", "//base:base_java__process_device", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
       "inputs": [ "//third_party/jdk/current/bin/java.chromium", "//third_party/r8/d8/lib/r8.jar", "//third_party/r8/custom_d8.jar", "//out/cronet/obj/base/base_java.processed.jar", "//out/cronet/obj/base/base_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/gyp/dex.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/md5_check.py" ],
       "metadata": {
 
@@ -2225,8 +2252,9 @@
    "//base:base_java__header": {
       "args": [ "--depfile=gen/base/base_java__header.d", "--generated-dir=gen/base/base_java/generated_java", "--jar-path=obj/base/base_java.turbine.jar", "--java-srcjars=[\"gen/base/base_android_java_enums_srcjar.srcjar\", \"gen/base/base_jni.srcjar\", \"gen/base/java_features_srcjar.srcjar\", \"gen/base/java_switches_srcjar.srcjar\", \"gen/base/base_java__assetres.srcjar\"]", "--target-name", "//base:base_java__header", "--classpath=@FileArg(gen/base/base_java.build_config.json:android:sdk_interface_jars)", "--classpath=@FileArg(gen/base/base_java.build_config.json:javac:interface_classpath)", "--processorpath=@FileArg(gen/base/base_java.build_config.json:javac:processor_classpath)", "--processors=@FileArg(gen/base/base_java.build_config.json:javac:processor_classes)", "--turbine-jar-path", "../../third_party/turbine/turbine.jar", "--generated-jar-path", "gen/base/base_java.generated.srcjar", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/base/base_java.sources" ],
       "depfile": "//out/cronet/gen/base/base_java__header.d",
-      "deps": [ "//base:base_android_java_enums_srcjar", "//base:base_java__assetres", "//base:base_java__build_config_crbug_908819", "//base:base_jni", "//base:java_features_srcjar", "//base:java_switches_srcjar", "//base:jni_java__header", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
-      "inputs": [ "//base/android/java/src/org/chromium/base/ActivityState.java", "//base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java", "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CallbackController.java", "//base/android/java/src/org/chromium/base/CollectionUtil.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/CommandLineInitUtil.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/ContextUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/DiscardableReferencePool.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/Flag.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/IntentUtils.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/LifetimeAssert.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/Log.java", "//base/android/java/src/org/chromium/base/MathUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/ObserverList.java", "//base/android/java/src/org/chromium/base/PackageManagerUtils.java", "//base/android/java/src/org/chromium/base/PackageUtils.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PiiElider.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/PowerMonitorForQ.java", "//base/android/java/src/org/chromium/base/Promise.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/RequiredCallback.java", "//base/android/java/src/org/chromium/base/ResettersForTesting.java", "//base/android/java/src/org/chromium/base/StreamUtil.java", "//base/android/java/src/org/chromium/base/StrictModeContext.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimeUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/UnownedUserData.java", "//base/android/java/src/org/chromium/base/UnownedUserDataHost.java", "//base/android/java/src/org/chromium/base/UnownedUserDataKey.java", "//base/android/java/src/org/chromium/base/UserData.java", "//base/android/java/src/org/chromium/base/UserDataHost.java", "//base/android/java/src/org/chromium/base/WrappedClassLoader.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForM.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForN.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForO.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForOMR1.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForP.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForQ.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForR.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForS.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsListener.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsStore.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankActivityTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankEndScenarioTime.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetrics.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingRunnable.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingScheduler.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankScenario.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerStateController.java", "//base/android/java/src/org/chromium/base/jank_tracker/PlaceholderJankTracker.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/library_loader/Linker.java", "//base/android/java/src/org/chromium/base/library_loader/LinkerJni.java", "//base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java", "//base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java", "//base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java", "//base/android/java/src/org/chromium/base/lifetime/DestroyChecker.java", "//base/android/java/src/org/chromium/base/lifetime/Destroyable.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java", "//base/android/java/src/org/chromium/base/memory/MemoryPurgeManager.java", "//base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/HistogramBucket.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/NoopUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/RecordHistogram.java", "//base/android/java/src/org/chromium/base/metrics/RecordUserAction.java", "//base/android/java/src/org/chromium/base/metrics/ScopedSysTraceEvent.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/metrics/TimingMetric.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java", "//base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/OneShotCallback.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/Supplier.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/UnownedUserDataSupplier.java", "//base/android/java/src/org/chromium/base/task/AsyncTask.java", "//base/android/java/src/org/chromium/base/task/BackgroundOnlyAsyncTask.java", "//base/android/java/src/org/chromium/base/task/ChainedTasks.java", "//base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/SerialExecutor.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/TaskExecutor.java", "//base/android/java/src/org/chromium/base/task/TaskRunner.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java", "//base/android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java", "//base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java", "//out/cronet/gen/base/base_android_java_enums_srcjar.srcjar", "//out/cronet/gen/base/base_jni.srcjar", "//out/cronet/gen/base/java_features_srcjar.srcjar", "//out/cronet/gen/base/java_switches_srcjar.srcjar", "//out/cronet/gen/base/base_java__assetres.srcjar", "//out/cronet/gen/base/base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "deps": [ "//base:base_android_java_enums_srcjar", "//base:base_java__assetres", "//base:base_java__build_config_crbug_908819", "//base:base_jni", "//base:java_features_srcjar", "//base:java_switches_srcjar", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
+      "inputs": [ "//base/android/java/src/org/chromium/base/ActivityState.java", "//base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java", "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CallbackController.java", "//base/android/java/src/org/chromium/base/CollectionUtil.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/CommandLineInitUtil.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/ContextUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/DiscardableReferencePool.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/Flag.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/IntentUtils.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/JniAndroid.java", "//base/android/java/src/org/chromium/base/LifetimeAssert.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/Log.java", "//base/android/java/src/org/chromium/base/MathUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/MutableFlagWithSafeDefault.java", "//base/android/java/src/org/chromium/base/ObserverList.java", "//base/android/java/src/org/chromium/base/PackageManagerUtils.java", "//base/android/java/src/org/chromium/base/PackageUtils.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PiiElider.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/PowerMonitorForQ.java", "//base/android/java/src/org/chromium/base/Promise.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/RequiredCallback.java", "//base/android/java/src/org/chromium/base/ResettersForTesting.java", "//base/android/java/src/org/chromium/base/StreamUtil.java", "//base/android/java/src/org/chromium/base/StrictModeContext.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimeUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/UnownedUserData.java", "//base/android/java/src/org/chromium/base/UnownedUserDataHost.java", "//base/android/java/src/org/chromium/base/UnownedUserDataKey.java", "//base/android/java/src/org/chromium/base/UserData.java", "//base/android/java/src/org/chromium/base/UserDataHost.java", "//base/android/java/src/org/chromium/base/WrappedClassLoader.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForM.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForN.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForO.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForOMR1.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForP.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForQ.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForR.java", "//base/android/java/src/org/chromium/base/compat/ApiHelperForS.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsListener.java", "//base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsStore.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankActivityTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankEndScenarioTime.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetrics.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingRunnable.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankReportingScheduler.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankScenario.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankTrackerStateController.java", "//base/android/java/src/org/chromium/base/jank_tracker/PlaceholderJankTracker.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/library_loader/Linker.java", "//base/android/java/src/org/chromium/base/library_loader/LinkerJni.java", "//base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java", "//base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java", "//base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java", "//base/android/java/src/org/chromium/base/lifetime/DestroyChecker.java", "//base/android/java/src/org/chromium/base/lifetime/Destroyable.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java", "//base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java", "//base/android/java/src/org/chromium/base/memory/MemoryPurgeManager.java", "//base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/HistogramBucket.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/NoopUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/RecordHistogram.java", "//base/android/java/src/org/chromium/base/metrics/RecordUserAction.java", "//base/android/java/src/org/chromium/base/metrics/ScopedSysTraceEvent.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/metrics/TimingMetric.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java", "//base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/LazyOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/ObservableSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/OneShotCallback.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/Supplier.java", "//base/android/java/src/org/chromium/base/supplier/SupplierUtils.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplier.java", "//base/android/java/src/org/chromium/base/supplier/SyncOneshotSupplierImpl.java", "//base/android/java/src/org/chromium/base/supplier/TransitiveObservableSupplier.java", "//base/android/java/src/org/chromium/base/supplier/UnownedUserDataSupplier.java", "//base/android/java/src/org/chromium/base/task/AsyncTask.java", "//base/android/java/src/org/chromium/base/task/BackgroundOnlyAsyncTask.java", "//base/android/java/src/org/chromium/base/task/ChainedTasks.java", "//base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/SerialExecutor.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java", "//base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/TaskExecutor.java", "//base/android/java/src/org/chromium/base/task/TaskRunner.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", "//base/android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java", "//base/android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java", "//base/test/android/javatests/src/stub/org/chromium/base/test/ClangProfiler.java", "//out/cronet/gen/base/base_android_java_enums_srcjar.srcjar", "//out/cronet/gen/base/base_jni.srcjar", "//out/cronet/gen/base/java_features_srcjar.srcjar", "//out/cronet/gen/base/java_switches_srcjar.srcjar", "//out/cronet/gen/base/base_java__assetres.srcjar", "//out/cronet/gen/base/base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -2240,7 +2268,7 @@
    },
    "//base:base_java__host": {
       "args": [ "--input", "obj/base/base_java.javac.jar", "--output", "lib.java/base/base_java.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:base_java__compile_java", "//base:jni_java__host", "//build/android:build_java__host", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__host", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java__host", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
+      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:base_java__compile_java", "//build/android:build_java__host", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__host", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java__host", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
       "inputs": [ "//out/cronet/obj/base/base_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
       "metadata": {
 
@@ -2255,7 +2283,7 @@
    },
    "//base:base_java__process_device": {
       "args": [ "--input", "obj/base/base_java.javac.jar", "--output", "obj/base/base_java.processed.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:base_java__compile_java", "//base:jni_java__host", "//build/android:build_java__host", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__host", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java__host", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
+      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:base_java__compile_java", "//build/android:build_java__host", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__host", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java__host", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
       "inputs": [ "//out/cronet/obj/base/base_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
       "metadata": {
 
@@ -2269,7 +2297,7 @@
       "visibility": [ "*" ]
    },
    "//base:base_java__validate": {
-      "deps": [ "//base:jni_java__validate", "//build/android:build_java__validate", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__validate", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__validate", "//third_party/androidx:androidx_annotation_annotation_experimental_java__validate", "//third_party/androidx:androidx_annotation_annotation_java__validate", "//third_party/jni_zero:jni_zero_java__validate" ],
+      "deps": [ "//build/android:build_java__validate", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__validate", "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java__validate", "//third_party/androidx:androidx_annotation_annotation_experimental_java__validate", "//third_party/androidx:androidx_annotation_annotation_java__validate", "//third_party/jni_zero:jni_zero_java__validate" ],
       "metadata": {
 
       },
@@ -2284,6 +2312,7 @@
       "metadata": {
          "all_deps": [ "//base:process_launcher_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/test/android/javatests/src/org/chromium/base/process_launcher/TestChildProcessConnection.java" ],
          "target_type": [ "java_library" ]
       },
@@ -2414,6 +2443,7 @@
       "metadata": {
          "all_deps": [ "//base:base_java", "//build/android:build_java", "//third_party/accessibility_test_framework:accessibility_test_framework_java", "//third_party/android_deps:espresso_java", "//third_party/android_deps:guava_android_java", "//third_party/android_sdk:android_test_base_java", "//third_party/android_sdk:android_test_mock_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_core_core_java", "//third_party/androidx:androidx_multidex_multidex_java", "//third_party/androidx:androidx_test_monitor_java", "//third_party/androidx:androidx_test_runner_java", "//third_party/androidx:androidx_test_uiautomator_uiautomator_java", "//third_party/hamcrest:hamcrest_java", "//third_party/jni_zero:jni_zero_java", "//third_party/junit:junit", "//base:base_java_url_utils_for_test" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/test/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java", "//base/test/android/javatests/src/org/chromium/base/test/BaseActivityTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java", "//base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java", "//base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4TestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/LoadNative.java", "//base/test/android/javatests/src/org/chromium/base/test/MockitoErrorHandler.java", "//base/test/android/javatests/src/org/chromium/base/test/ResetCachedFlagValuesTestHook.java", "//base/test/android/javatests/src/org/chromium/base/test/ResettersForTestingTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java", "//base/test/android/javatests/src/org/chromium/base/test/TestListInstrumentationRunListener.java", "//base/test/android/javatests/src/org/chromium/base/test/TestTraceEvent.java", "//base/test/android/javatests/src/org/chromium/base/test/UiThreadStatement.java", "//base/test/android/javatests/src/org/chromium/base/test/UiThreadTest.java", "//base/test/android/javatests/src/org/chromium/base/test/UnitTestLifetimeAssertRule.java", "//base/test/android/javatests/src/org/chromium/base/test/UnitTestNoBrowserProcessHook.java", "//base/test/android/javatests/src/org/chromium/base/test/params/BaseJUnit4RunnerDelegate.java", "//base/test/android/javatests/src/org/chromium/base/test/params/BlockJUnit4RunnerDelegate.java", "//base/test/android/javatests/src/org/chromium/base/test/params/MethodParamAnnotationRule.java", "//base/test/android/javatests/src/org/chromium/base/test/params/MethodParamRule.java", "//base/test/android/javatests/src/org/chromium/base/test/params/ParameterAnnotations.java", "//base/test/android/javatests/src/org/chromium/base/test/params/ParameterProvider.java", "//base/test/android/javatests/src/org/chromium/base/test/params/ParameterSet.java", "//base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedCommandLineFlags.java", "//base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedFrameworkMethod.java", "//base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunner.java", "//base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegate.java", "//base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommon.java", "//base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactory.java", "//base/test/android/javatests/src/org/chromium/base/test/params/SkipCommandLineParameterization.java", "//base/test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.java", "//base/test/android/javatests/src/org/chromium/base/test/util/AndroidSdkLevelSkipCheck.java", "//base/test/android/javatests/src/org/chromium/base/test/util/AnnotationProcessingUtils.java", "//base/test/android/javatests/src/org/chromium/base/test/util/AnnotationRule.java", "//base/test/android/javatests/src/org/chromium/base/test/util/ApplicationContextWrapper.java", "//base/test/android/javatests/src/org/chromium/base/test/util/ApplicationTestUtils.java", "//base/test/android/javatests/src/org/chromium/base/test/util/Batch.java", "//base/test/android/javatests/src/org/chromium/base/test/util/CallbackHelper.java", "//base/test/android/javatests/src/org/chromium/base/test/util/CommandLineFlags.java", "//base/test/android/javatests/src/org/chromium/base/test/util/Criteria.java", "//base/test/android/javatests/src/org/chromium/base/test/util/CriteriaHelper.java", "//base/test/android/javatests/src/org/chromium/base/test/util/CriteriaNotSatisfiedException.java", "//base/test/android/javatests/src/org/chromium/base/test/util/DisableIf.java", "//base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java", "//base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java", "//base/test/android/javatests/src/org/chromium/base/test/util/DoNotBatch.java", "//base/test/android/javatests/src/org/chromium/base/test/util/DoNotRevive.java", "//base/test/android/javatests/src/org/chromium/base/test/util/DumpThreadsOnFailureRule.java", "//base/test/android/javatests/src/org/chromium/base/test/util/EnormousTest.java", "//base/test/android/javatests/src/org/chromium/base/test/util/EspressoIdleTimeoutRule.java", "//base/test/android/javatests/src/org/chromium/base/test/util/Feature.java", "//base/test/android/javatests/src/org/chromium/base/test/util/Features.java", "//base/test/android/javatests/src/org/chromium/base/test/util/FeaturesBase.java", "//base/test/android/javatests/src/org/chromium/base/test/util/HistogramWatcher.java", "//base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.java", "//base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferencesContext.java", "//base/test/android/javatests/src/org/chromium/base/test/util/IntegrationTest.java", "//base/test/android/javatests/src/org/chromium/base/test/util/JniMocker.java", "//base/test/android/javatests/src/org/chromium/base/test/util/LooperUtils.java", "//base/test/android/javatests/src/org/chromium/base/test/util/Manual.java", "//base/test/android/javatests/src/org/chromium/base/test/util/MaxAndroidSdkLevel.java", "//base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java", "//base/test/android/javatests/src/org/chromium/base/test/util/PackageManagerWrapper.java", "//base/test/android/javatests/src/org/chromium/base/test/util/PayloadCallbackHelper.java", "//base/test/android/javatests/src/org/chromium/base/test/util/RequiresRestart.java", "//base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java", "//base/test/android/javatests/src/org/chromium/base/test/util/RestrictionSkipCheck.java", "//base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java", "//base/test/android/javatests/src/org/chromium/base/test/util/SkipCheck.java", "//base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java", "//base/test/android/javatests/src/org/chromium/base/test/util/TestThreadUtils.java", "//base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java", "//base/test/android/javatests/src/org/chromium/base/test/util/TimeoutTimer.java", "//base/test/android/javatests/src/org/chromium/base/test/util/UserActionTester.java" ],
          "target_type": [ "java_library" ]
       },
@@ -2544,6 +2574,7 @@
       "metadata": {
          "all_deps": [ "//base:base_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_test_monitor_java", "//third_party/hamcrest:hamcrest_java", "//third_party/jni_zero:jni_zero_java", "//third_party/junit:junit", "//base:base_java_test_support_uncommon_jni" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/test/android/javatests/src/org/chromium/base/FakeTimeTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/BundleTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/ReachedCodeProfiler.java", "//base/test/android/javatests/src/org/chromium/base/test/SetUpStatement.java", "//base/test/android/javatests/src/org/chromium/base/test/SetUpTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/task/SchedulerTestHelpers.java", "//base/test/android/javatests/src/org/chromium/base/test/task/ThreadPoolTestHelpers.java", "//base/test/android/javatests/src/org/chromium/base/test/util/CloseableOnMainThread.java", "//base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java", "//base/test/android/javatests/src/org/chromium/base/test/util/Matchers.java" ],
          "target_type": [ "java_library" ]
       },
@@ -2585,6 +2616,7 @@
       "depfile": "//out/cronet/gen/base/base_java_test_support_uncommon__compile_java.d",
       "deps": [ "//base:base_java__header", "//base:base_java_test_support_uncommon__build_config_crbug_908819", "//base:base_java_test_support_uncommon__header", "//base:base_java_test_support_uncommon_jni", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_test_monitor_java__header", "//third_party/hamcrest:hamcrest_java__header", "//third_party/jni_zero:jni_zero_java__header", "//third_party/junit:junit__header" ],
       "inputs": [ "//base/test/android/javatests/src/org/chromium/base/FakeTimeTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/BundleTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/ReachedCodeProfiler.java", "//base/test/android/javatests/src/org/chromium/base/test/SetUpStatement.java", "//base/test/android/javatests/src/org/chromium/base/test/SetUpTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/task/SchedulerTestHelpers.java", "//base/test/android/javatests/src/org/chromium/base/test/task/ThreadPoolTestHelpers.java", "//base/test/android/javatests/src/org/chromium/base/test/util/CloseableOnMainThread.java", "//base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java", "//base/test/android/javatests/src/org/chromium/base/test/util/Matchers.java", "//out/cronet/gen/base/base_java_test_support_uncommon_jni.srcjar", "//out/cronet/gen/base/base_java_test_support_uncommon.generated.srcjar", "//out/cronet/gen/base/base_java_test_support_uncommon.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_java_test_support_uncommon.sources", "//out/cronet/obj/base/base_java_test_support_uncommon.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -2617,6 +2649,7 @@
       "depfile": "//out/cronet/gen/base/base_java_test_support_uncommon__header.d",
       "deps": [ "//base:base_java__header", "//base:base_java_test_support_uncommon__build_config_crbug_908819", "//base:base_java_test_support_uncommon_jni", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_test_monitor_java__header", "//third_party/hamcrest:hamcrest_java__header", "//third_party/jni_zero:jni_zero_java__header", "//third_party/junit:junit__header" ],
       "inputs": [ "//base/test/android/javatests/src/org/chromium/base/FakeTimeTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/BundleTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/ReachedCodeProfiler.java", "//base/test/android/javatests/src/org/chromium/base/test/SetUpStatement.java", "//base/test/android/javatests/src/org/chromium/base/test/SetUpTestRule.java", "//base/test/android/javatests/src/org/chromium/base/test/task/SchedulerTestHelpers.java", "//base/test/android/javatests/src/org/chromium/base/test/task/ThreadPoolTestHelpers.java", "//base/test/android/javatests/src/org/chromium/base/test/util/CloseableOnMainThread.java", "//base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java", "//base/test/android/javatests/src/org/chromium/base/test/util/Matchers.java", "//out/cronet/gen/base/base_java_test_support_uncommon_jni.srcjar", "//out/cronet/gen/base/base_java_test_support_uncommon.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_java_test_support_uncommon.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -2670,6 +2703,19 @@
       "visibility": [ "*" ]
    },
    "//base:base_java_test_support_uncommon_jni": {
+      "deps": [ "//base:base_java_test_support_uncommon_jni__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": true,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base:base_java_test_support_uncommon_jni__action": {
       "args": [ "from-source", "--output-dir", "gen/jni_headers/base/base_java_test_support_uncommon_jni", "--extra-include", "../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/base/base_java_test_support_uncommon_jni.srcjar", "--use-proxy-hash", "--output-name", "ReachedCodeProfiler_jni.h", "--output-name", "ThreadPoolTestHelpers_jni.h", "--input-file=../../base/test/android/javatests/src/org/chromium/base/test/ReachedCodeProfiler.java", "--input-file=../../base/test/android/javatests/src/org/chromium/base/test/task/ThreadPoolTestHelpers.java" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//base/test/android/javatests/src/org/chromium/base/test/ReachedCodeProfiler.java", "//base/test/android/javatests/src/org/chromium/base/test/task/ThreadPoolTestHelpers.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -2679,9 +2725,9 @@
       },
       "outputs": [ "//out/cronet/gen/base/base_java_test_support_uncommon_jni.srcjar", "//out/cronet/gen/jni_headers/base/base_java_test_support_uncommon_jni/ReachedCodeProfiler_jni.h", "//out/cronet/gen/jni_headers/base/base_java_test_support_uncommon_jni/ThreadPoolTestHelpers_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
-      "testonly": true,
+      "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "action",
       "visibility": [ "*" ]
@@ -2691,6 +2737,7 @@
       "metadata": {
          "all_deps": [ "//base:base_java", "//third_party/jni_zero:jni_zero_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java", "//base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java" ],
          "target_type": [ "java_library" ]
       },
@@ -2821,6 +2868,7 @@
       "metadata": {
          "all_deps": [ "//base:base_java", "//build/android:build_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java", "//third_party/junit:junit" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java" ],
          "target_type": [ "java_library" ]
       },
@@ -2951,6 +2999,7 @@
       "metadata": {
          "all_deps": [ "//base:base_java", "//base:base_java_test_support", "//base:base_java_test_support_uncommon", "//base/test:test_support_java", "//build/android:build_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_test_monitor_java", "//third_party/androidx:androidx_test_runner_java", "//third_party/hamcrest:hamcrest_java", "//third_party/jni_zero:jni_zero_java", "//third_party/junit:junit", "//third_party/mockito:mockito_java", "//base:base_javatests_jni" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/android/javatests/src/org/chromium/base/AdvancedMockContextTest.java", "//base/android/javatests/src/org/chromium/base/AssertsTest.java", "//base/android/javatests/src/org/chromium/base/CommandLineFlagsTest.java", "//base/android/javatests/src/org/chromium/base/CommandLineInitUtilTest.java", "//base/android/javatests/src/org/chromium/base/CommandLineTest.java", "//base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java", "//base/android/javatests/src/org/chromium/base/IntentUtilsTest.java", "//base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java", "//base/android/javatests/src/org/chromium/base/ObserverListTest.java", "//base/android/javatests/src/org/chromium/base/PackageUtilsTest.java", "//base/android/javatests/src/org/chromium/base/StrictModeContextTest.java", "//base/android/javatests/src/org/chromium/base/UserDataHostTest.java", "//base/android/javatests/src/org/chromium/base/library_loader/EarlyNativeTest.java", "//base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java", "//base/android/javatests/src/org/chromium/base/task/AsyncTaskTest.java", "//base/android/javatests/src/org/chromium/base/task/PostTaskTest.java", "//base/android/javatests/src/org/chromium/base/task/SequencedTaskRunnerImplTest.java", "//base/android/javatests/src/org/chromium/base/task/SingleThreadTaskRunnerImplTest.java", "//base/android/javatests/src/org/chromium/base/task/TaskRunnerImplTest.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherTestBase.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherTransitionToNativeTest.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherWithNativeTest.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherWithoutNativeTest.java", "//base/android/javatests/src/org/chromium/base/util/GarbageCollectionTestUtilsTest.java" ],
          "target_type": [ "java_library" ]
       },
@@ -2992,6 +3041,7 @@
       "depfile": "//out/cronet/gen/base/base_javatests__compile_java.d",
       "deps": [ "//base:base_java__header", "//base:base_java_test_support__header", "//base:base_java_test_support_uncommon__header", "//base:base_javatests__build_config_crbug_908819", "//base:base_javatests__header", "//base:base_javatests_jni", "//base/test:test_support_java__header", "//build/android:build_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_test_monitor_java__header", "//third_party/androidx:androidx_test_runner_java__header", "//third_party/hamcrest:hamcrest_java__header", "//third_party/jni_zero:jni_zero_java__header", "//third_party/junit:junit__header", "//third_party/mockito:mockito_java__header" ],
       "inputs": [ "//base/android/javatests/src/org/chromium/base/AdvancedMockContextTest.java", "//base/android/javatests/src/org/chromium/base/AssertsTest.java", "//base/android/javatests/src/org/chromium/base/CommandLineFlagsTest.java", "//base/android/javatests/src/org/chromium/base/CommandLineInitUtilTest.java", "//base/android/javatests/src/org/chromium/base/CommandLineTest.java", "//base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java", "//base/android/javatests/src/org/chromium/base/IntentUtilsTest.java", "//base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java", "//base/android/javatests/src/org/chromium/base/ObserverListTest.java", "//base/android/javatests/src/org/chromium/base/PackageUtilsTest.java", "//base/android/javatests/src/org/chromium/base/StrictModeContextTest.java", "//base/android/javatests/src/org/chromium/base/UserDataHostTest.java", "//base/android/javatests/src/org/chromium/base/library_loader/EarlyNativeTest.java", "//base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java", "//base/android/javatests/src/org/chromium/base/task/AsyncTaskTest.java", "//base/android/javatests/src/org/chromium/base/task/PostTaskTest.java", "//base/android/javatests/src/org/chromium/base/task/SequencedTaskRunnerImplTest.java", "//base/android/javatests/src/org/chromium/base/task/SingleThreadTaskRunnerImplTest.java", "//base/android/javatests/src/org/chromium/base/task/TaskRunnerImplTest.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherTestBase.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherTransitionToNativeTest.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherWithNativeTest.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherWithoutNativeTest.java", "//base/android/javatests/src/org/chromium/base/util/GarbageCollectionTestUtilsTest.java", "//out/cronet/gen/base/base_javatests_jni.srcjar", "//out/cronet/gen/base/base_javatests.generated.srcjar", "//out/cronet/gen/base/base_javatests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_javatests.sources", "//out/cronet/obj/base/base_javatests.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -3024,6 +3074,7 @@
       "depfile": "//out/cronet/gen/base/base_javatests__header.d",
       "deps": [ "//base:base_java__header", "//base:base_java_test_support__header", "//base:base_java_test_support_uncommon__header", "//base:base_javatests__build_config_crbug_908819", "//base:base_javatests_jni", "//base/test:test_support_java__header", "//build/android:build_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_test_monitor_java__header", "//third_party/androidx:androidx_test_runner_java__header", "//third_party/hamcrest:hamcrest_java__header", "//third_party/jni_zero:jni_zero_java__header", "//third_party/junit:junit__header", "//third_party/mockito:mockito_java__header" ],
       "inputs": [ "//base/android/javatests/src/org/chromium/base/AdvancedMockContextTest.java", "//base/android/javatests/src/org/chromium/base/AssertsTest.java", "//base/android/javatests/src/org/chromium/base/CommandLineFlagsTest.java", "//base/android/javatests/src/org/chromium/base/CommandLineInitUtilTest.java", "//base/android/javatests/src/org/chromium/base/CommandLineTest.java", "//base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java", "//base/android/javatests/src/org/chromium/base/IntentUtilsTest.java", "//base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java", "//base/android/javatests/src/org/chromium/base/ObserverListTest.java", "//base/android/javatests/src/org/chromium/base/PackageUtilsTest.java", "//base/android/javatests/src/org/chromium/base/StrictModeContextTest.java", "//base/android/javatests/src/org/chromium/base/UserDataHostTest.java", "//base/android/javatests/src/org/chromium/base/library_loader/EarlyNativeTest.java", "//base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java", "//base/android/javatests/src/org/chromium/base/task/AsyncTaskTest.java", "//base/android/javatests/src/org/chromium/base/task/PostTaskTest.java", "//base/android/javatests/src/org/chromium/base/task/SequencedTaskRunnerImplTest.java", "//base/android/javatests/src/org/chromium/base/task/SingleThreadTaskRunnerImplTest.java", "//base/android/javatests/src/org/chromium/base/task/TaskRunnerImplTest.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherTestBase.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherTransitionToNativeTest.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherWithNativeTest.java", "//base/android/javatests/src/org/chromium/base/test/metrics/HistogramWatcherWithoutNativeTest.java", "//base/android/javatests/src/org/chromium/base/util/GarbageCollectionTestUtilsTest.java", "//out/cronet/gen/base/base_javatests_jni.srcjar", "//out/cronet/gen/base/base_javatests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_javatests.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -3077,6 +3128,19 @@
       "visibility": [ "*" ]
    },
    "//base:base_javatests_jni": {
+      "deps": [ "//base:base_javatests_jni__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": true,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base:base_javatests_jni__action": {
       "args": [ "from-source", "--output-dir", "gen/jni_headers/base/base_javatests_jni", "--extra-include", "../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/base/base_javatests_jni.srcjar", "--use-proxy-hash", "--output-name", "EarlyNativeTest_jni.h", "--input-file=../../base/android/javatests/src/org/chromium/base/library_loader/EarlyNativeTest.java" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//base/android/javatests/src/org/chromium/base/library_loader/EarlyNativeTest.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -3086,9 +3150,9 @@
       },
       "outputs": [ "//out/cronet/gen/base/base_javatests_jni.srcjar", "//out/cronet/gen/jni_headers/base/base_javatests_jni/EarlyNativeTest_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
-      "testonly": true,
+      "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "action",
       "visibility": [ "*" ]
@@ -3098,20 +3162,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/jni_zero:jni_include_dir" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "USE_CHROMIUM_BASE" ],
       "deps": [ "//base:base", "//base:base_javatests_jni" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//out/cronet/gen/jni_headers/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -3126,16 +3190,30 @@
       "visibility": [ "*" ]
    },
    "//base:base_jni": {
-      "args": [ "from-source", "--output-dir", "gen/jni_headers/base/base_jni", "--extra-include", "../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/base/base_jni.srcjar", "--use-proxy-hash", "--output-name", "ApkAssets_jni.h", "--output-name", "ApplicationStatus_jni.h", "--output-name", "BaseFeatureMap_jni.h", "--output-name", "BuildInfo_jni.h", "--output-name", "BundleUtils_jni.h", "--output-name", "Callback_jni.h", "--output-name", "CommandLine_jni.h", "--output-name", "ContentUriUtils_jni.h", "--output-name", "CpuFeatures_jni.h", "--output-name", "EarlyTraceEvent_jni.h", "--output-name", "EventLog_jni.h", "--output-name", "FeatureList_jni.h", "--output-name", "FeatureMap_jni.h", "--output-name", "Features_jni.h", "--output-name", "FieldTrialList_jni.h", "--output-name", "FileUtils_jni.h", "--output-name", "ImportantFileWriterAndroid_jni.h", "--output-name", "IntStringCallback_jni.h", "--output-name", "JNIUtils_jni.h", "--output-name", "JavaExceptionReporter_jni.h", "--output-name", "JavaHandlerThread_jni.h", "--output-name", "LocaleUtils_jni.h", "--output-name", "MemoryPressureListener_jni.h", "--output-name", "PathService_jni.h", "--output-name", "PathUtils_jni.h", "--output-name", "PiiElider_jni.h", "--output-name", "PowerMonitor_jni.h", "--output-name", "RadioUtils_jni.h", "--output-name", "SysUtils_jni.h", "--output-name", "ThreadUtils_jni.h", "--output-name", "TimezoneUtils_jni.h", "--output-name", "TraceEvent_jni.h", "--output-name", "UnguessableToken_jni.h", "--output-name", "JankMetricUMARecorder_jni.h", "--output-name", "LibraryLoader_jni.h", "--output-name", "LibraryPrefetcher_jni.h", "--output-name", "JavaHeapDumpGenerator_jni.h", "--output-name", "MemoryInfoBridge_jni.h", "--output-name", "NativeUmaRecorder_jni.h", "--output-name", "StatisticsRecorderAndroid_jni.h", "--output-name", "PostTask_jni.h", "--output-name", "TaskRunnerImpl_jni.h", "--input-file=../../base/android/java/src/org/chromium/base/ApkAssets.java", "--input-file=../../base/android/java/src/org/chromium/base/ApplicationStatus.java", "--input-file=../../base/android/java/src/org/chromium/base/BaseFeatureMap.java", "--input-file=../../base/android/java/src/org/chromium/base/BuildInfo.java", "--input-file=../../base/android/java/src/org/chromium/base/BundleUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/Callback.java", "--input-file=../../base/android/java/src/org/chromium/base/CommandLine.java", "--input-file=../../base/android/java/src/org/chromium/base/ContentUriUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/CpuFeatures.java", "--input-file=../../base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "--input-file=../../base/android/java/src/org/chromium/base/EventLog.java", "--input-file=../../base/android/java/src/org/chromium/base/FeatureList.java", "--input-file=../../base/android/java/src/org/chromium/base/FeatureMap.java", "--input-file=../../base/android/java/src/org/chromium/base/Features.java", "--input-file=../../base/android/java/src/org/chromium/base/FieldTrialList.java", "--input-file=../../base/android/java/src/org/chromium/base/FileUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "--input-file=../../base/android/java/src/org/chromium/base/IntStringCallback.java", "--input-file=../../base/android/java/src/org/chromium/base/JNIUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "--input-file=../../base/android/java/src/org/chromium/base/JavaHandlerThread.java", "--input-file=../../base/android/java/src/org/chromium/base/LocaleUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/MemoryPressureListener.java", "--input-file=../../base/android/java/src/org/chromium/base/PathService.java", "--input-file=../../base/android/java/src/org/chromium/base/PathUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/PiiElider.java", "--input-file=../../base/android/java/src/org/chromium/base/PowerMonitor.java", "--input-file=../../base/android/java/src/org/chromium/base/RadioUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/SysUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/ThreadUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/TimezoneUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/TraceEvent.java", "--input-file=../../base/android/java/src/org/chromium/base/UnguessableToken.java", "--input-file=../../base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "--input-file=../../base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "--input-file=../../base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "--input-file=../../base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "--input-file=../../base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "--input-file=../../base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "--input-file=../../base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "--input-file=../../base/android/java/src/org/chromium/base/task/PostTask.java", "--input-file=../../base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java" ],
-      "deps": [ "//base:android_runtime_jni_headers", "//base:android_runtime_unchecked_jni_headers", "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
-      "inputs": [ "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PiiElider.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
+      "deps": [ "//base:base_jni__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
-         "jni_source_files": [ "android/java/src/org/chromium/base/ApkAssets.java", "android/java/src/org/chromium/base/ApplicationStatus.java", "android/java/src/org/chromium/base/BaseFeatureMap.java", "android/java/src/org/chromium/base/BuildInfo.java", "android/java/src/org/chromium/base/BundleUtils.java", "android/java/src/org/chromium/base/Callback.java", "android/java/src/org/chromium/base/CommandLine.java", "android/java/src/org/chromium/base/ContentUriUtils.java", "android/java/src/org/chromium/base/CpuFeatures.java", "android/java/src/org/chromium/base/EarlyTraceEvent.java", "android/java/src/org/chromium/base/EventLog.java", "android/java/src/org/chromium/base/FeatureList.java", "android/java/src/org/chromium/base/FeatureMap.java", "android/java/src/org/chromium/base/Features.java", "android/java/src/org/chromium/base/FieldTrialList.java", "android/java/src/org/chromium/base/FileUtils.java", "android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "android/java/src/org/chromium/base/IntStringCallback.java", "android/java/src/org/chromium/base/JNIUtils.java", "android/java/src/org/chromium/base/JavaExceptionReporter.java", "android/java/src/org/chromium/base/JavaHandlerThread.java", "android/java/src/org/chromium/base/LocaleUtils.java", "android/java/src/org/chromium/base/MemoryPressureListener.java", "android/java/src/org/chromium/base/PathService.java", "android/java/src/org/chromium/base/PathUtils.java", "android/java/src/org/chromium/base/PiiElider.java", "android/java/src/org/chromium/base/PowerMonitor.java", "android/java/src/org/chromium/base/RadioUtils.java", "android/java/src/org/chromium/base/SysUtils.java", "android/java/src/org/chromium/base/ThreadUtils.java", "android/java/src/org/chromium/base/TimezoneUtils.java", "android/java/src/org/chromium/base/TraceEvent.java", "android/java/src/org/chromium/base/UnguessableToken.java", "android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "android/java/src/org/chromium/base/task/PostTask.java", "android/java/src/org/chromium/base/task/TaskRunnerImpl.java" ],
-         "jni_source_files_abs": [ "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PiiElider.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java" ]
+
       },
-      "outputs": [ "//out/cronet/gen/base/base_jni.srcjar", "//out/cronet/gen/jni_headers/base/base_jni/ApkAssets_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/ApplicationStatus_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/BaseFeatureMap_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/BuildInfo_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/BundleUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/Callback_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/CommandLine_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/ContentUriUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/CpuFeatures_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/EarlyTraceEvent_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/EventLog_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/FeatureList_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/FeatureMap_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/Features_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/FieldTrialList_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/FileUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/ImportantFileWriterAndroid_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/IntStringCallback_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JNIUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JavaExceptionReporter_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JavaHandlerThread_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/LocaleUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/MemoryPressureListener_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/PathService_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/PathUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/PiiElider_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/PowerMonitor_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/RadioUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/SysUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/ThreadUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/TimezoneUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/TraceEvent_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/UnguessableToken_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JankMetricUMARecorder_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/LibraryLoader_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/LibraryPrefetcher_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JavaHeapDumpGenerator_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/MemoryInfoBridge_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/NativeUmaRecorder_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/StatisticsRecorderAndroid_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/PostTask_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/TaskRunnerImpl_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": false,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base:base_jni__action": {
+      "args": [ "from-source", "--output-dir", "gen/jni_headers/base/base_jni", "--extra-include", "../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/base/base_jni.srcjar", "--use-proxy-hash", "--output-name", "ApkAssets_jni.h", "--output-name", "ApplicationStatus_jni.h", "--output-name", "BaseFeatureMap_jni.h", "--output-name", "BuildInfo_jni.h", "--output-name", "BundleUtils_jni.h", "--output-name", "Callback_jni.h", "--output-name", "CommandLine_jni.h", "--output-name", "ContentUriUtils_jni.h", "--output-name", "CpuFeatures_jni.h", "--output-name", "EarlyTraceEvent_jni.h", "--output-name", "EventLog_jni.h", "--output-name", "FeatureList_jni.h", "--output-name", "FeatureMap_jni.h", "--output-name", "Features_jni.h", "--output-name", "FieldTrialList_jni.h", "--output-name", "FileUtils_jni.h", "--output-name", "ImportantFileWriterAndroid_jni.h", "--output-name", "IntStringCallback_jni.h", "--output-name", "JNIUtils_jni.h", "--output-name", "JavaExceptionReporter_jni.h", "--output-name", "JavaHandlerThread_jni.h", "--output-name", "JniAndroid_jni.h", "--output-name", "LocaleUtils_jni.h", "--output-name", "MemoryPressureListener_jni.h", "--output-name", "PathService_jni.h", "--output-name", "PathUtils_jni.h", "--output-name", "PowerMonitor_jni.h", "--output-name", "RadioUtils_jni.h", "--output-name", "SysUtils_jni.h", "--output-name", "ThreadUtils_jni.h", "--output-name", "TimezoneUtils_jni.h", "--output-name", "TraceEvent_jni.h", "--output-name", "UnguessableToken_jni.h", "--output-name", "JankMetricUMARecorder_jni.h", "--output-name", "LibraryLoader_jni.h", "--output-name", "LibraryPrefetcher_jni.h", "--output-name", "JavaHeapDumpGenerator_jni.h", "--output-name", "MemoryInfoBridge_jni.h", "--output-name", "NativeUmaRecorder_jni.h", "--output-name", "StatisticsRecorderAndroid_jni.h", "--output-name", "PostTask_jni.h", "--output-name", "TaskRunnerImpl_jni.h", "--input-file=../../base/android/java/src/org/chromium/base/ApkAssets.java", "--input-file=../../base/android/java/src/org/chromium/base/ApplicationStatus.java", "--input-file=../../base/android/java/src/org/chromium/base/BaseFeatureMap.java", "--input-file=../../base/android/java/src/org/chromium/base/BuildInfo.java", "--input-file=../../base/android/java/src/org/chromium/base/BundleUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/Callback.java", "--input-file=../../base/android/java/src/org/chromium/base/CommandLine.java", "--input-file=../../base/android/java/src/org/chromium/base/ContentUriUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/CpuFeatures.java", "--input-file=../../base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "--input-file=../../base/android/java/src/org/chromium/base/EventLog.java", "--input-file=../../base/android/java/src/org/chromium/base/FeatureList.java", "--input-file=../../base/android/java/src/org/chromium/base/FeatureMap.java", "--input-file=../../base/android/java/src/org/chromium/base/Features.java", "--input-file=../../base/android/java/src/org/chromium/base/FieldTrialList.java", "--input-file=../../base/android/java/src/org/chromium/base/FileUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "--input-file=../../base/android/java/src/org/chromium/base/IntStringCallback.java", "--input-file=../../base/android/java/src/org/chromium/base/JNIUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "--input-file=../../base/android/java/src/org/chromium/base/JavaHandlerThread.java", "--input-file=../../base/android/java/src/org/chromium/base/JniAndroid.java", "--input-file=../../base/android/java/src/org/chromium/base/LocaleUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/MemoryPressureListener.java", "--input-file=../../base/android/java/src/org/chromium/base/PathService.java", "--input-file=../../base/android/java/src/org/chromium/base/PathUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/PowerMonitor.java", "--input-file=../../base/android/java/src/org/chromium/base/RadioUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/SysUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/ThreadUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/TimezoneUtils.java", "--input-file=../../base/android/java/src/org/chromium/base/TraceEvent.java", "--input-file=../../base/android/java/src/org/chromium/base/UnguessableToken.java", "--input-file=../../base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "--input-file=../../base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "--input-file=../../base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "--input-file=../../base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "--input-file=../../base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "--input-file=../../base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "--input-file=../../base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "--input-file=../../base/android/java/src/org/chromium/base/task/PostTask.java", "--input-file=../../base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java" ],
+      "deps": [ "//base:android_runtime_jni_headers", "//base:android_runtime_unchecked_jni_headers", "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
+      "inputs": [ "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/JniAndroid.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+         "jni_source_files": [ "android/java/src/org/chromium/base/ApkAssets.java", "android/java/src/org/chromium/base/ApplicationStatus.java", "android/java/src/org/chromium/base/BaseFeatureMap.java", "android/java/src/org/chromium/base/BuildInfo.java", "android/java/src/org/chromium/base/BundleUtils.java", "android/java/src/org/chromium/base/Callback.java", "android/java/src/org/chromium/base/CommandLine.java", "android/java/src/org/chromium/base/ContentUriUtils.java", "android/java/src/org/chromium/base/CpuFeatures.java", "android/java/src/org/chromium/base/EarlyTraceEvent.java", "android/java/src/org/chromium/base/EventLog.java", "android/java/src/org/chromium/base/FeatureList.java", "android/java/src/org/chromium/base/FeatureMap.java", "android/java/src/org/chromium/base/Features.java", "android/java/src/org/chromium/base/FieldTrialList.java", "android/java/src/org/chromium/base/FileUtils.java", "android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "android/java/src/org/chromium/base/IntStringCallback.java", "android/java/src/org/chromium/base/JNIUtils.java", "android/java/src/org/chromium/base/JavaExceptionReporter.java", "android/java/src/org/chromium/base/JavaHandlerThread.java", "android/java/src/org/chromium/base/JniAndroid.java", "android/java/src/org/chromium/base/LocaleUtils.java", "android/java/src/org/chromium/base/MemoryPressureListener.java", "android/java/src/org/chromium/base/PathService.java", "android/java/src/org/chromium/base/PathUtils.java", "android/java/src/org/chromium/base/PowerMonitor.java", "android/java/src/org/chromium/base/RadioUtils.java", "android/java/src/org/chromium/base/SysUtils.java", "android/java/src/org/chromium/base/ThreadUtils.java", "android/java/src/org/chromium/base/TimezoneUtils.java", "android/java/src/org/chromium/base/TraceEvent.java", "android/java/src/org/chromium/base/UnguessableToken.java", "android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "android/java/src/org/chromium/base/task/PostTask.java", "android/java/src/org/chromium/base/task/TaskRunnerImpl.java" ],
+         "jni_source_files_abs": [ "//base/android/java/src/org/chromium/base/ApkAssets.java", "//base/android/java/src/org/chromium/base/ApplicationStatus.java", "//base/android/java/src/org/chromium/base/BaseFeatureMap.java", "//base/android/java/src/org/chromium/base/BuildInfo.java", "//base/android/java/src/org/chromium/base/BundleUtils.java", "//base/android/java/src/org/chromium/base/Callback.java", "//base/android/java/src/org/chromium/base/CommandLine.java", "//base/android/java/src/org/chromium/base/ContentUriUtils.java", "//base/android/java/src/org/chromium/base/CpuFeatures.java", "//base/android/java/src/org/chromium/base/EarlyTraceEvent.java", "//base/android/java/src/org/chromium/base/EventLog.java", "//base/android/java/src/org/chromium/base/FeatureList.java", "//base/android/java/src/org/chromium/base/FeatureMap.java", "//base/android/java/src/org/chromium/base/Features.java", "//base/android/java/src/org/chromium/base/FieldTrialList.java", "//base/android/java/src/org/chromium/base/FileUtils.java", "//base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", "//base/android/java/src/org/chromium/base/IntStringCallback.java", "//base/android/java/src/org/chromium/base/JNIUtils.java", "//base/android/java/src/org/chromium/base/JavaExceptionReporter.java", "//base/android/java/src/org/chromium/base/JavaHandlerThread.java", "//base/android/java/src/org/chromium/base/JniAndroid.java", "//base/android/java/src/org/chromium/base/LocaleUtils.java", "//base/android/java/src/org/chromium/base/MemoryPressureListener.java", "//base/android/java/src/org/chromium/base/PathService.java", "//base/android/java/src/org/chromium/base/PathUtils.java", "//base/android/java/src/org/chromium/base/PowerMonitor.java", "//base/android/java/src/org/chromium/base/RadioUtils.java", "//base/android/java/src/org/chromium/base/SysUtils.java", "//base/android/java/src/org/chromium/base/ThreadUtils.java", "//base/android/java/src/org/chromium/base/TimezoneUtils.java", "//base/android/java/src/org/chromium/base/TraceEvent.java", "//base/android/java/src/org/chromium/base/UnguessableToken.java", "//base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", "//base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", "//base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java", "//base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", "//base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", "//base/android/java/src/org/chromium/base/task/PostTask.java", "//base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java" ]
+      },
+      "outputs": [ "//out/cronet/gen/base/base_jni.srcjar", "//out/cronet/gen/jni_headers/base/base_jni/ApkAssets_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/ApplicationStatus_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/BaseFeatureMap_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/BuildInfo_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/BundleUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/Callback_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/CommandLine_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/ContentUriUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/CpuFeatures_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/EarlyTraceEvent_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/EventLog_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/FeatureList_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/FeatureMap_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/Features_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/FieldTrialList_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/FileUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/ImportantFileWriterAndroid_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/IntStringCallback_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JNIUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JavaExceptionReporter_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JavaHandlerThread_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JniAndroid_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/LocaleUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/MemoryPressureListener_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/PathService_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/PathUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/PowerMonitor_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/RadioUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/SysUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/ThreadUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/TimezoneUtils_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/TraceEvent_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/UnguessableToken_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JankMetricUMARecorder_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/LibraryLoader_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/LibraryPrefetcher_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/JavaHeapDumpGenerator_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/MemoryInfoBridge_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/NativeUmaRecorder_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/StatisticsRecorderAndroid_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/PostTask_jni.h", "//out/cronet/gen/jni_headers/base/base_jni/TaskRunnerImpl_jni.h" ],
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -3322,7 +3400,7 @@
       "args": [ "--depfile=gen/base/base_junit_tests__compile_java.d", "--generated-dir=gen/base/base_junit_tests/generated_java", "--jar-path=obj/base/base_junit_tests.javac.jar", "--java-srcjars=[\"gen/base/base_junit_tests__compile_resources.srcjar\", \"gen/build/android/build_config_for_testing_gen.srcjar\", \"gen/base/base_junit_tests__native_libraries.srcjar\", \"gen/base/base_junit_tests__final_jni.srcjar\", \"gen/base/base_junit_tests.generated.srcjar\"]", "--target-name", "//base:base_junit_tests__compile_java", "--classpath=@FileArg(gen/base/base_junit_tests.build_config.json:android:sdk_interface_jars)", "--header-jar", "obj/base/base_junit_tests.turbine.jar", "--classpath=[\"obj/base/base_junit_tests.turbine.jar\"]", "--classpath=@FileArg(gen/base/base_junit_tests.build_config.json:deps_info:javac_full_interface_classpath)", "--chromium-code=1", "--warnings-as-errors", "@gen/base/base_junit_tests.sources" ],
       "depfile": "//out/cronet/gen/base/base_junit_tests__compile_java.d",
       "deps": [ "//base:base_java__header", "//base:base_java_process_launcher_test_support__header", "//base:base_java_test_support__header", "//base:base_java_test_support_uncommon__header", "//base:base_junit_test_support__header", "//base:base_junit_tests__build_config_crbug_908819", "//base:base_junit_tests__compile_resources", "//base:base_junit_tests__final_jni", "//base:base_junit_tests__java_binary__header", "//base:base_junit_tests__native_libraries", "//base:base_shared_preferences_java__header", "//base/test:test_support_java__header", "//build/android:build_config_for_testing_gen", "//testing/android/junit:junit_test_support__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_deps:robolectric_all_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_test_core_java__header", "//third_party/androidx:androidx_test_runner_java__header", "//third_party/hamcrest:hamcrest_java__header", "//third_party/jni_zero:jni_zero_java__header", "//third_party/junit:junit__header", "//third_party/mockito:mockito_jvm_java__header", "//third_party/robolectric:robolectric_test_sdk_java__header" ],
-      "inputs": [ "//base/android/junit/src/org/chromium/base/ApplicationStatusTest.java", "//base/android/junit/src/org/chromium/base/BuildInfoTest.java", "//base/android/junit/src/org/chromium/base/CallbackControllerTest.java", "//base/android/junit/src/org/chromium/base/CollectionUtilTest.java", "//base/android/junit/src/org/chromium/base/CommandLineTest.java", "//base/android/junit/src/org/chromium/base/DiscardableReferencePoolTest.java", "//base/android/junit/src/org/chromium/base/FeatureListUnitTest.java", "//base/android/junit/src/org/chromium/base/FileUtilsTest.java", "//base/android/junit/src/org/chromium/base/LifetimeAssertTest.java", "//base/android/junit/src/org/chromium/base/LogTest.java", "//base/android/junit/src/org/chromium/base/MathUtilsTest.java", "//base/android/junit/src/org/chromium/base/PathUtilsTest.java", "//base/android/junit/src/org/chromium/base/PiiEliderTest.java", "//base/android/junit/src/org/chromium/base/PromiseTest.java", "//base/android/junit/src/org/chromium/base/ResettersForTestingTest.java", "//base/android/junit/src/org/chromium/base/TimeUtilsTest.java", "//base/android/junit/src/org/chromium/base/TraceEventTest.java", "//base/android/junit/src/org/chromium/base/UnownedUserDataHostTest.java", "//base/android/junit/src/org/chromium/base/UnownedUserDataKeyTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/FrameMetricsListenerTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/FrameMetricsStoreTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankActivityTrackerTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankMetricUMARecorderTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankReportingRunnableTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankReportingSchedulerTest.java", "//base/android/junit/src/org/chromium/base/library_loader/LinkerTest.java", "//base/android/junit/src/org/chromium/base/memory/MemoryPressureMonitorTest.java", "//base/android/junit/src/org/chromium/base/memory/MemoryPurgeManagerTest.java", "//base/android/junit/src/org/chromium/base/metrics/CachingUmaRecorderTest.java", "//base/android/junit/src/org/chromium/base/process_launcher/ChildConnectionAllocatorTest.java", "//base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/KeyPrefixTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/KnownPreferenceKeyRegistriesTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/SharedPreferencesManagerTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/StrictPreferenceKeyCheckerTest.java", "//base/android/junit/src/org/chromium/base/supplier/LazyOneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/ObservableSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/OneShotCallbackTest.java", "//base/android/junit/src/org/chromium/base/supplier/OneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/SyncOneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/TransitiveObservableSupplierTest.java", "//base/android/junit/src/org/chromium/base/supplier/UnownedUserDataSupplierTest.java", "//base/android/junit/src/org/chromium/base/task/AsyncTaskThreadTest.java", "//base/android/junit/src/org/chromium/base/task/SequencedTaskRunnerTaskMigrationTest.java", "//base/android/junit/src/org/chromium/base/util/GarbageCollectionTestUtilsUnitTest.java", "//base/test/android/junit/src/org/chromium/base/test/SetUpStatementTest.java", "//base/test/android/junit/src/org/chromium/base/test/TestListInstrumentationRunListenerTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ExampleParameterizedTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommonTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactoryTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedTestNameTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/AndroidSdkLevelSkipCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/AnnotationProcessingUtilsTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/CommandLineFlagsNoClassAnnotationCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/CommandLineFlagsWithClassAnnotationCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisabledTestForClassRobolectricTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisabledTestRobolectricTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/SkipCheckTest.java", "//out/cronet/gen/base/base_junit_tests__compile_resources.srcjar", "//out/cronet/gen/build/android/build_config_for_testing_gen.srcjar", "//out/cronet/gen/base/base_junit_tests__native_libraries.srcjar", "//out/cronet/gen/base/base_junit_tests__final_jni.srcjar", "//out/cronet/gen/base/base_junit_tests.generated.srcjar", "//out/cronet/gen/base/base_junit_tests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_junit_tests.sources", "//out/cronet/obj/base/base_junit_tests.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "inputs": [ "//base/android/junit/src/org/chromium/base/ApplicationStatusTest.java", "//base/android/junit/src/org/chromium/base/BuildInfoTest.java", "//base/android/junit/src/org/chromium/base/CallbackControllerTest.java", "//base/android/junit/src/org/chromium/base/CollectionUtilTest.java", "//base/android/junit/src/org/chromium/base/CommandLineTest.java", "//base/android/junit/src/org/chromium/base/DiscardableReferencePoolTest.java", "//base/android/junit/src/org/chromium/base/FeatureListUnitTest.java", "//base/android/junit/src/org/chromium/base/FileUtilsTest.java", "//base/android/junit/src/org/chromium/base/LifetimeAssertTest.java", "//base/android/junit/src/org/chromium/base/LogTest.java", "//base/android/junit/src/org/chromium/base/MathUtilsTest.java", "//base/android/junit/src/org/chromium/base/MutableFlagWithSafeDefaultUnitTest.java", "//base/android/junit/src/org/chromium/base/PathUtilsTest.java", "//base/android/junit/src/org/chromium/base/PiiEliderTest.java", "//base/android/junit/src/org/chromium/base/PromiseTest.java", "//base/android/junit/src/org/chromium/base/ResettersForTestingTest.java", "//base/android/junit/src/org/chromium/base/TimeUtilsTest.java", "//base/android/junit/src/org/chromium/base/TraceEventTest.java", "//base/android/junit/src/org/chromium/base/UnownedUserDataHostTest.java", "//base/android/junit/src/org/chromium/base/UnownedUserDataKeyTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/FrameMetricsListenerTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/FrameMetricsStoreTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankActivityTrackerTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankMetricUMARecorderTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankReportingRunnableTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankReportingSchedulerTest.java", "//base/android/junit/src/org/chromium/base/library_loader/LinkerTest.java", "//base/android/junit/src/org/chromium/base/memory/MemoryPressureMonitorTest.java", "//base/android/junit/src/org/chromium/base/memory/MemoryPurgeManagerTest.java", "//base/android/junit/src/org/chromium/base/metrics/CachingUmaRecorderTest.java", "//base/android/junit/src/org/chromium/base/process_launcher/ChildConnectionAllocatorTest.java", "//base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/KeyPrefixTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/KnownPreferenceKeyRegistriesTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/SharedPreferencesManagerTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/StrictPreferenceKeyCheckerTest.java", "//base/android/junit/src/org/chromium/base/supplier/LazyOneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/LazyOneshotSupplierTest.java", "//base/android/junit/src/org/chromium/base/supplier/ObservableSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/OneShotCallbackTest.java", "//base/android/junit/src/org/chromium/base/supplier/OneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/SupplierUtilsTest.java", "//base/android/junit/src/org/chromium/base/supplier/SyncOneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/TransitiveObservableSupplierTest.java", "//base/android/junit/src/org/chromium/base/supplier/UnownedUserDataSupplierTest.java", "//base/android/junit/src/org/chromium/base/task/AsyncTaskThreadTest.java", "//base/android/junit/src/org/chromium/base/task/SequencedTaskRunnerTaskMigrationTest.java", "//base/android/junit/src/org/chromium/base/util/GarbageCollectionTestUtilsUnitTest.java", "//base/test/android/junit/src/org/chromium/base/test/SetUpStatementTest.java", "//base/test/android/junit/src/org/chromium/base/test/TestListInstrumentationRunListenerTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ExampleParameterizedTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommonTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactoryTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedTestNameTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/AndroidSdkLevelSkipCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/AnnotationProcessingUtilsTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/CommandLineFlagsNoClassAnnotationCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/CommandLineFlagsWithClassAnnotationCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisabledTestForClassRobolectricTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisabledTestRobolectricTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/SkipCheckTest.java", "//out/cronet/gen/base/base_junit_tests__compile_resources.srcjar", "//out/cronet/gen/build/android/build_config_for_testing_gen.srcjar", "//out/cronet/gen/base/base_junit_tests__native_libraries.srcjar", "//out/cronet/gen/base/base_junit_tests__final_jni.srcjar", "//out/cronet/gen/base/base_junit_tests.generated.srcjar", "//out/cronet/gen/base/base_junit_tests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_junit_tests.sources", "//out/cronet/obj/base/base_junit_tests.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
       "metadata": {
 
       },
@@ -3408,7 +3486,7 @@
       "args": [ "--depfile=gen/base/base_junit_tests__java_binary__header.d", "--generated-dir=gen/base/base_junit_tests/generated_java", "--jar-path=obj/base/base_junit_tests.turbine.jar", "--java-srcjars=[\"gen/base/base_junit_tests__compile_resources.srcjar\", \"gen/build/android/build_config_for_testing_gen.srcjar\", \"gen/base/base_junit_tests__native_libraries.srcjar\", \"gen/base/base_junit_tests__final_jni.srcjar\"]", "--target-name", "//base:base_junit_tests__java_binary__header", "--classpath=@FileArg(gen/base/base_junit_tests.build_config.json:android:sdk_interface_jars)", "--classpath=@FileArg(gen/base/base_junit_tests.build_config.json:javac:interface_classpath)", "--processorpath=@FileArg(gen/base/base_junit_tests.build_config.json:javac:processor_classpath)", "--processors=@FileArg(gen/base/base_junit_tests.build_config.json:javac:processor_classes)", "--turbine-jar-path", "../../third_party/turbine/turbine.jar", "--generated-jar-path", "gen/base/base_junit_tests.generated.srcjar", "--chromium-code=1", "--warnings-as-errors", "@gen/base/base_junit_tests.sources" ],
       "depfile": "//out/cronet/gen/base/base_junit_tests__java_binary__header.d",
       "deps": [ "//base:base_java__header", "//base:base_java_process_launcher_test_support__header", "//base:base_java_test_support__header", "//base:base_java_test_support_uncommon__header", "//base:base_junit_test_support__header", "//base:base_junit_tests__build_config_crbug_908819", "//base:base_junit_tests__compile_resources", "//base:base_junit_tests__final_jni", "//base:base_junit_tests__native_libraries", "//base:base_shared_preferences_java__header", "//base/test:test_support_java__header", "//build/android:build_config_for_testing_gen", "//testing/android/junit:junit_test_support__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_deps:robolectric_all_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_test_core_java__header", "//third_party/androidx:androidx_test_runner_java__header", "//third_party/hamcrest:hamcrest_java__header", "//third_party/jni_zero:jni_zero_java__header", "//third_party/junit:junit__header", "//third_party/mockito:mockito_jvm_java__header", "//third_party/robolectric:robolectric_test_sdk_java__header" ],
-      "inputs": [ "//base/android/junit/src/org/chromium/base/ApplicationStatusTest.java", "//base/android/junit/src/org/chromium/base/BuildInfoTest.java", "//base/android/junit/src/org/chromium/base/CallbackControllerTest.java", "//base/android/junit/src/org/chromium/base/CollectionUtilTest.java", "//base/android/junit/src/org/chromium/base/CommandLineTest.java", "//base/android/junit/src/org/chromium/base/DiscardableReferencePoolTest.java", "//base/android/junit/src/org/chromium/base/FeatureListUnitTest.java", "//base/android/junit/src/org/chromium/base/FileUtilsTest.java", "//base/android/junit/src/org/chromium/base/LifetimeAssertTest.java", "//base/android/junit/src/org/chromium/base/LogTest.java", "//base/android/junit/src/org/chromium/base/MathUtilsTest.java", "//base/android/junit/src/org/chromium/base/PathUtilsTest.java", "//base/android/junit/src/org/chromium/base/PiiEliderTest.java", "//base/android/junit/src/org/chromium/base/PromiseTest.java", "//base/android/junit/src/org/chromium/base/ResettersForTestingTest.java", "//base/android/junit/src/org/chromium/base/TimeUtilsTest.java", "//base/android/junit/src/org/chromium/base/TraceEventTest.java", "//base/android/junit/src/org/chromium/base/UnownedUserDataHostTest.java", "//base/android/junit/src/org/chromium/base/UnownedUserDataKeyTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/FrameMetricsListenerTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/FrameMetricsStoreTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankActivityTrackerTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankMetricUMARecorderTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankReportingRunnableTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankReportingSchedulerTest.java", "//base/android/junit/src/org/chromium/base/library_loader/LinkerTest.java", "//base/android/junit/src/org/chromium/base/memory/MemoryPressureMonitorTest.java", "//base/android/junit/src/org/chromium/base/memory/MemoryPurgeManagerTest.java", "//base/android/junit/src/org/chromium/base/metrics/CachingUmaRecorderTest.java", "//base/android/junit/src/org/chromium/base/process_launcher/ChildConnectionAllocatorTest.java", "//base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/KeyPrefixTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/KnownPreferenceKeyRegistriesTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/SharedPreferencesManagerTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/StrictPreferenceKeyCheckerTest.java", "//base/android/junit/src/org/chromium/base/supplier/LazyOneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/ObservableSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/OneShotCallbackTest.java", "//base/android/junit/src/org/chromium/base/supplier/OneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/SyncOneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/TransitiveObservableSupplierTest.java", "//base/android/junit/src/org/chromium/base/supplier/UnownedUserDataSupplierTest.java", "//base/android/junit/src/org/chromium/base/task/AsyncTaskThreadTest.java", "//base/android/junit/src/org/chromium/base/task/SequencedTaskRunnerTaskMigrationTest.java", "//base/android/junit/src/org/chromium/base/util/GarbageCollectionTestUtilsUnitTest.java", "//base/test/android/junit/src/org/chromium/base/test/SetUpStatementTest.java", "//base/test/android/junit/src/org/chromium/base/test/TestListInstrumentationRunListenerTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ExampleParameterizedTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommonTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactoryTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedTestNameTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/AndroidSdkLevelSkipCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/AnnotationProcessingUtilsTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/CommandLineFlagsNoClassAnnotationCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/CommandLineFlagsWithClassAnnotationCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisabledTestForClassRobolectricTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisabledTestRobolectricTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/SkipCheckTest.java", "//out/cronet/gen/base/base_junit_tests__compile_resources.srcjar", "//out/cronet/gen/build/android/build_config_for_testing_gen.srcjar", "//out/cronet/gen/base/base_junit_tests__native_libraries.srcjar", "//out/cronet/gen/base/base_junit_tests__final_jni.srcjar", "//out/cronet/gen/base/base_junit_tests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_junit_tests.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "inputs": [ "//base/android/junit/src/org/chromium/base/ApplicationStatusTest.java", "//base/android/junit/src/org/chromium/base/BuildInfoTest.java", "//base/android/junit/src/org/chromium/base/CallbackControllerTest.java", "//base/android/junit/src/org/chromium/base/CollectionUtilTest.java", "//base/android/junit/src/org/chromium/base/CommandLineTest.java", "//base/android/junit/src/org/chromium/base/DiscardableReferencePoolTest.java", "//base/android/junit/src/org/chromium/base/FeatureListUnitTest.java", "//base/android/junit/src/org/chromium/base/FileUtilsTest.java", "//base/android/junit/src/org/chromium/base/LifetimeAssertTest.java", "//base/android/junit/src/org/chromium/base/LogTest.java", "//base/android/junit/src/org/chromium/base/MathUtilsTest.java", "//base/android/junit/src/org/chromium/base/MutableFlagWithSafeDefaultUnitTest.java", "//base/android/junit/src/org/chromium/base/PathUtilsTest.java", "//base/android/junit/src/org/chromium/base/PiiEliderTest.java", "//base/android/junit/src/org/chromium/base/PromiseTest.java", "//base/android/junit/src/org/chromium/base/ResettersForTestingTest.java", "//base/android/junit/src/org/chromium/base/TimeUtilsTest.java", "//base/android/junit/src/org/chromium/base/TraceEventTest.java", "//base/android/junit/src/org/chromium/base/UnownedUserDataHostTest.java", "//base/android/junit/src/org/chromium/base/UnownedUserDataKeyTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/FrameMetricsListenerTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/FrameMetricsStoreTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankActivityTrackerTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankMetricUMARecorderTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankReportingRunnableTest.java", "//base/android/junit/src/org/chromium/base/jank_tracker/JankReportingSchedulerTest.java", "//base/android/junit/src/org/chromium/base/library_loader/LinkerTest.java", "//base/android/junit/src/org/chromium/base/memory/MemoryPressureMonitorTest.java", "//base/android/junit/src/org/chromium/base/memory/MemoryPurgeManagerTest.java", "//base/android/junit/src/org/chromium/base/metrics/CachingUmaRecorderTest.java", "//base/android/junit/src/org/chromium/base/process_launcher/ChildConnectionAllocatorTest.java", "//base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/KeyPrefixTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/KnownPreferenceKeyRegistriesTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/SharedPreferencesManagerTest.java", "//base/android/junit/src/org/chromium/base/shared_preferences/StrictPreferenceKeyCheckerTest.java", "//base/android/junit/src/org/chromium/base/supplier/LazyOneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/LazyOneshotSupplierTest.java", "//base/android/junit/src/org/chromium/base/supplier/ObservableSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/OneShotCallbackTest.java", "//base/android/junit/src/org/chromium/base/supplier/OneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/SupplierUtilsTest.java", "//base/android/junit/src/org/chromium/base/supplier/SyncOneshotSupplierImplTest.java", "//base/android/junit/src/org/chromium/base/supplier/TransitiveObservableSupplierTest.java", "//base/android/junit/src/org/chromium/base/supplier/UnownedUserDataSupplierTest.java", "//base/android/junit/src/org/chromium/base/task/AsyncTaskThreadTest.java", "//base/android/junit/src/org/chromium/base/task/SequencedTaskRunnerTaskMigrationTest.java", "//base/android/junit/src/org/chromium/base/util/GarbageCollectionTestUtilsUnitTest.java", "//base/test/android/junit/src/org/chromium/base/test/SetUpStatementTest.java", "//base/test/android/junit/src/org/chromium/base/test/TestListInstrumentationRunListenerTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ExampleParameterizedTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommonTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactoryTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerTest.java", "//base/test/android/junit/src/org/chromium/base/test/params/ParameterizedTestNameTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/AndroidSdkLevelSkipCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/AnnotationProcessingUtilsTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/CommandLineFlagsNoClassAnnotationCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/CommandLineFlagsWithClassAnnotationCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisabledTestForClassRobolectricTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/DisabledTestRobolectricTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java", "//base/test/android/junit/src/org/chromium/base/test/util/SkipCheckTest.java", "//out/cronet/gen/base/base_junit_tests__compile_resources.srcjar", "//out/cronet/gen/build/android/build_config_for_testing_gen.srcjar", "//out/cronet/gen/base/base_junit_tests__native_libraries.srcjar", "//out/cronet/gen/base/base_junit_tests__final_jni.srcjar", "//out/cronet/gen/base/base_junit_tests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_junit_tests.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
       "metadata": {
 
       },
@@ -3502,10 +3580,10 @@
 
       },
       "output_patterns": [ "//out/cronet/obj/base/base_nocompile_tests_new/{{source_name_part}}_placeholder.o" ],
-      "outputs": [ "//out/cronet/obj/base/base_nocompile_tests_new/callback_list_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/weak_ptr_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/no_destructor_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/stringprintf_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/values_nocompile_placeholder.o" ],
+      "outputs": [ "//out/cronet/obj/base/base_nocompile_tests_new/thread_annotations_pa_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/raw_ptr_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/raw_ref_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/callback_list_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/buffer_iterator_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/checked_iterators_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/contains_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/enum_set_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/span_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/crash_logging_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/ref_counted_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/weak_ptr_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/field_trial_params_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/histogram_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/no_destructor_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/observer_list_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/sequence_checker_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/string_piece_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/stringprintf_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/bind_post_task_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/task_traits_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/thread_annotations_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/traits_bag_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/pass_key_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/variant_util_nocompile_placeholder.o", "//out/cronet/obj/base/base_nocompile_tests_new/values_nocompile_placeholder.o" ],
       "public": "*",
       "script": "//tools/nocompile/wrapper.py",
-      "sources": [ "//base/callback_list_nocompile.nc", "//base/memory/weak_ptr_nocompile.nc", "//base/no_destructor_nocompile.nc", "//base/strings/stringprintf_nocompile.nc", "//base/values_nocompile.nc" ],
+      "sources": [ "//base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/thread_annotations_pa_nocompile.nc", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_nocompile.nc", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ref_nocompile.nc", "//base/callback_list_nocompile.nc", "//base/containers/buffer_iterator_nocompile.nc", "//base/containers/checked_iterators_nocompile.nc", "//base/containers/contains_nocompile.nc", "//base/containers/enum_set_nocompile.nc", "//base/containers/span_nocompile.nc", "//base/debug/crash_logging_nocompile.nc", "//base/memory/ref_counted_nocompile.nc", "//base/memory/weak_ptr_nocompile.nc", "//base/metrics/field_trial_params_nocompile.nc", "//base/metrics/histogram_nocompile.nc", "//base/no_destructor_nocompile.nc", "//base/observer_list_nocompile.nc", "//base/sequence_checker_nocompile.nc", "//base/strings/string_piece_nocompile.nc", "//base/strings/stringprintf_nocompile.nc", "//base/task/bind_post_task_nocompile.nc", "//base/task/task_traits_nocompile.nc", "//base/thread_annotations_nocompile.nc", "//base/traits_bag_nocompile.nc", "//base/types/pass_key_nocompile.nc", "//base/types/variant_util_nocompile.nc", "//base/values_nocompile.nc" ],
       "testonly": true,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "action_foreach",
@@ -3680,6 +3758,7 @@
       "metadata": {
          "all_deps": [ "//base:base", "//base:debugging_buildflags", "//base/test:test_support", "//base/test:test_support_perf", "//testing/gtest:gtest", "//testing/perf:perf", "//third_party/google_benchmark:google_benchmark", "//testing/android/native_test:native_test_native_code", "//base/test:test_support_java", "//build/android/gtest_apk:native_test_instrumentation_test_runner_java", "//testing/android/native_test:native_test_java", "//base:base_perftests__apk__secondary_abi_shared_library_list", "//base:base_perftests__apk__shared_library_list", "//base:base_perftests__library__jni_registration", "//base:base_perftests__apk__compile_resources", "//base:base_perftests__apk__native_libraries", "//base:base_perftests__apk__build_config_srcjar" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [  ],
          "target_type": [ "android_apk" ]
       },
@@ -3827,20 +3906,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/android:hide_all_but_jni", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config", "//base/test:perf_test_config", "//build/config/sanitizers:link_shared_library" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST", "PERF_TEST" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/android:hide_all_but_jni", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config", "//base/test:perf_test_config", "//build/config/sanitizers:link_shared_library" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST", "PERF_TEST" ],
       "deps": [ "//base:base", "//base:debugging_buildflags", "//base/test:test_support", "//base/test:test_support_perf", "//build/config:shared_library_deps", "//testing:run_perf_test", "//testing/android/native_test:native_test_native_code", "//testing/gtest:gtest", "//testing/perf:perf", "//third_party/google_benchmark:google_benchmark" ],
       "externs": {
 
       },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/" ],
-      "ldflags": [ "-LinkWrapper,add-whole-archive=base.rlib", "-LinkWrapper,add-whole-archive=debugging_buildflags.rlib", "-LinkWrapper,add-whole-archive=test_support.rlib", "-LinkWrapper,add-whole-archive=test_support_perf.rlib", "-LinkWrapper,add-whole-archive=gtest.rlib", "-LinkWrapper,add-whole-archive=perf.rlib", "-LinkWrapper,add-whole-archive=google_benchmark.rlib", "-LinkWrapper,add-whole-archive=native_test_native_code.rlib", "-LinkWrapper,add-whole-archive=native_test_native_code.rlib", "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../build/android/android_only_jni_exports.lst", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/re2/src/" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../build/android/android_only_jni_exports.lst", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "dl", "m", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
          "shared_libraries": [ "//out/cronet/libbase_perftests__library.so" ]
@@ -3937,20 +4016,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/sanitizers:link_shared_library" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/sanitizers:link_shared_library" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//build/config:loadable_module_deps" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support", "dl", "m" ],
       "metadata": {
          "shared_libraries": [ "//out/cronet/libbase_profiler_reparsing_test_support_library.so" ]
@@ -3970,6 +4049,7 @@
       "metadata": {
          "all_deps": [ "//build/android:build_java", "//third_party/jni_zero:jni_zero_java", "//base:base_profiler_test_support_jni" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/android/javatests/src/org/chromium/base/profiler/TestSupport.java" ],
          "target_type": [ "java_library" ]
       },
@@ -4011,6 +4091,7 @@
       "depfile": "//out/cronet/gen/base/base_profiler_test_support_java__compile_java.d",
       "deps": [ "//base:base_profiler_test_support_java__build_config_crbug_908819", "//base:base_profiler_test_support_java__header", "//base:base_profiler_test_support_jni", "//build/android:build_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
       "inputs": [ "//base/android/javatests/src/org/chromium/base/profiler/TestSupport.java", "//out/cronet/gen/base/base_profiler_test_support_jni.srcjar", "//out/cronet/gen/base/base_profiler_test_support_java.generated.srcjar", "//out/cronet/gen/base/base_profiler_test_support_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_profiler_test_support_java.sources", "//out/cronet/obj/base/base_profiler_test_support_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -4043,6 +4124,7 @@
       "depfile": "//out/cronet/gen/base/base_profiler_test_support_java__header.d",
       "deps": [ "//base:base_profiler_test_support_java__build_config_crbug_908819", "//base:base_profiler_test_support_jni", "//build/android:build_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
       "inputs": [ "//base/android/javatests/src/org/chromium/base/profiler/TestSupport.java", "//out/cronet/gen/base/base_profiler_test_support_jni.srcjar", "//out/cronet/gen/base/base_profiler_test_support_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_profiler_test_support_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -4096,6 +4178,19 @@
       "visibility": [ "*" ]
    },
    "//base:base_profiler_test_support_jni": {
+      "deps": [ "//base:base_profiler_test_support_jni__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": true,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base:base_profiler_test_support_jni__action": {
       "args": [ "from-source", "--output-dir", "gen/jni_headers/base/base_profiler_test_support_jni", "--extra-include", "../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/base/base_profiler_test_support_jni.srcjar", "--use-proxy-hash", "--output-name", "TestSupport_jni.h", "--input-file=../../base/android/javatests/src/org/chromium/base/profiler/TestSupport.java" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//base/android/javatests/src/org/chromium/base/profiler/TestSupport.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -4105,9 +4200,9 @@
       },
       "outputs": [ "//out/cronet/gen/base/base_profiler_test_support_jni.srcjar", "//out/cronet/gen/jni_headers/base/base_profiler_test_support_jni/TestSupport_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
-      "testonly": true,
+      "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "action",
       "visibility": [ "*" ]
@@ -4116,20 +4211,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/sanitizers:link_shared_library" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/sanitizers:link_shared_library" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//build/config:loadable_module_deps" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support", "dl", "m" ],
       "metadata": {
          "shared_libraries": [ "//out/cronet/libbase_profiler_test_support_library.so" ]
@@ -4145,10 +4240,11 @@
       "visibility": [ "*" ]
    },
    "//base:base_shared_preferences_java": {
-      "deps": [ "//base:base_java", "//base:base_shared_preferences_java__assetres", "//base:base_shared_preferences_java__dex", "//base:base_shared_preferences_java__process_device", "//base:base_shared_preferences_java__validate", "//base:jni_java", "//third_party/android_deps:guava_android_java", "//third_party/androidx:androidx_annotation_annotation_java" ],
+      "deps": [ "//base:base_java", "//base:base_shared_preferences_java__assetres", "//base:base_shared_preferences_java__dex", "//base:base_shared_preferences_java__process_device", "//base:base_shared_preferences_java__validate", "//build/android:build_java", "//third_party/android_deps:guava_android_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java" ],
       "metadata": {
-         "all_deps": [ "//base:base_java", "//base:jni_java", "//third_party/android_deps:guava_android_java", "//third_party/androidx:androidx_annotation_annotation_java" ],
+         "all_deps": [ "//base:base_java", "//build/android:build_java", "//third_party/android_deps:guava_android_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/android/java/src/org/chromium/base/shared_preferences/KeyPrefix.java", "//base/android/java/src/org/chromium/base/shared_preferences/KnownPreferenceKeyRegistries.java", "//base/android/java/src/org/chromium/base/shared_preferences/NoOpPreferenceKeyChecker.java", "//base/android/java/src/org/chromium/base/shared_preferences/PreferenceKeyChecker.java", "//base/android/java/src/org/chromium/base/shared_preferences/PreferenceKeyRegistry.java", "//base/android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java", "//base/android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java" ],
          "target_type": [ "java_library" ]
       },
@@ -4159,7 +4255,7 @@
       "visibility": [ "*" ]
    },
    "//base:base_shared_preferences_java__assetres": {
-      "deps": [ "//base:base_java__assetres", "//base:jni_java__assetres", "//third_party/android_deps:guava_android_java__assetres", "//third_party/androidx:androidx_annotation_annotation_java__assetres" ],
+      "deps": [ "//base:base_java__assetres", "//build/android:build_java__assetres", "//third_party/android_deps:guava_android_java__assetres", "//third_party/androidx:androidx_annotation_annotation_java__assetres", "//third_party/jni_zero:jni_zero_java__assetres" ],
       "metadata": {
 
       },
@@ -4170,10 +4266,10 @@
       "visibility": [ "*" ]
    },
    "//base:base_shared_preferences_java__build_config_crbug_908819": {
-      "args": [ "--type=java_library", "--depfile", "gen/base/base_shared_preferences_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/base/base_java.build_config.json\", \"gen/base/jni_java.build_config.json\", \"gen/third_party/android_deps/guava_android_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/base/base_shared_preferences_java.build_config.json", "--gn-target", "//base:base_shared_preferences_java", "--device-jar-path", "obj/base/base_shared_preferences_java.processed.jar", "--host-jar-path", "lib.java/base/base_shared_preferences_java.jar", "--unprocessed-jar-path", "obj/base/base_shared_preferences_java.javac.jar", "--interface-jar-path", "obj/base/base_shared_preferences_java.turbine.jar", "--dex-path", "obj/base/base_shared_preferences_java.dex.jar", "--supports-android", "--requires-android", "--target-sources-file", "gen/base/base_shared_preferences_java.sources", "--bundled-srcjars=[]" ],
+      "args": [ "--type=java_library", "--depfile", "gen/base/base_shared_preferences_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/base/base_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_deps/guava_android_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/base/base_shared_preferences_java.build_config.json", "--gn-target", "//base:base_shared_preferences_java", "--device-jar-path", "obj/base/base_shared_preferences_java.processed.jar", "--host-jar-path", "lib.java/base/base_shared_preferences_java.jar", "--unprocessed-jar-path", "obj/base/base_shared_preferences_java.javac.jar", "--interface-jar-path", "obj/base/base_shared_preferences_java.turbine.jar", "--dex-path", "obj/base/base_shared_preferences_java.dex.jar", "--supports-android", "--requires-android", "--target-sources-file", "gen/base/base_shared_preferences_java.sources", "--bundled-srcjars=[]" ],
       "depfile": "//out/cronet/gen/base/base_shared_preferences_java__build_config_crbug_908819.d",
-      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:jni_java__build_config_crbug_908819", "//third_party/android_deps:guava_android_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819" ],
-      "inputs": [ "//out/cronet/gen/base/base_java.build_config.json", "//out/cronet/gen/base/jni_java.build_config.json", "//out/cronet/gen/third_party/android_deps/guava_android_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
+      "deps": [ "//base:base_java__build_config_crbug_908819", "//build/android:build_java__build_config_crbug_908819", "//third_party/android_deps:guava_android_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819", "//third_party/jni_zero:jni_zero_java__build_config_crbug_908819" ],
+      "inputs": [ "//out/cronet/gen/base/base_java.build_config.json", "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/android_deps/guava_android_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/third_party/jni_zero/jni_zero_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
       "metadata": {
 
       },
@@ -4188,7 +4284,7 @@
    "//base:base_shared_preferences_java__compile_java": {
       "args": [ "--depfile=gen/base/base_shared_preferences_java__compile_java.d", "--generated-dir=gen/base/base_shared_preferences_java/generated_java", "--jar-path=obj/base/base_shared_preferences_java.javac.jar", "--java-srcjars=[\"gen/base/base_shared_preferences_java.generated.srcjar\"]", "--target-name", "//base:base_shared_preferences_java__compile_java", "--classpath=@FileArg(gen/base/base_shared_preferences_java.build_config.json:android:sdk_interface_jars)", "--header-jar", "obj/base/base_shared_preferences_java.turbine.jar", "--classpath=[\"obj/base/base_shared_preferences_java.turbine.jar\"]", "--classpath=@FileArg(gen/base/base_shared_preferences_java.build_config.json:deps_info:javac_full_interface_classpath)", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/base/base_shared_preferences_java.sources" ],
       "depfile": "//out/cronet/gen/base/base_shared_preferences_java__compile_java.d",
-      "deps": [ "//base:base_java__header", "//base:base_shared_preferences_java__build_config_crbug_908819", "//base:base_shared_preferences_java__header", "//base:jni_java__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header" ],
+      "deps": [ "//base:base_java__header", "//base:base_shared_preferences_java__build_config_crbug_908819", "//base:base_shared_preferences_java__header", "//build/android:build_java__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
       "inputs": [ "//base/android/java/src/org/chromium/base/shared_preferences/KeyPrefix.java", "//base/android/java/src/org/chromium/base/shared_preferences/KnownPreferenceKeyRegistries.java", "//base/android/java/src/org/chromium/base/shared_preferences/NoOpPreferenceKeyChecker.java", "//base/android/java/src/org/chromium/base/shared_preferences/PreferenceKeyChecker.java", "//base/android/java/src/org/chromium/base/shared_preferences/PreferenceKeyRegistry.java", "//base/android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java", "//base/android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java", "//out/cronet/gen/base/base_shared_preferences_java.generated.srcjar", "//out/cronet/gen/base/base_shared_preferences_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_shared_preferences_java.sources", "//out/cronet/obj/base/base_shared_preferences_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
       "metadata": {
 
@@ -4204,7 +4300,7 @@
    "//base:base_shared_preferences_java__dex": {
       "args": [ "--depfile", "gen/base/base_shared_preferences_java__dex.d", "--output", "obj/base/base_shared_preferences_java.dex.jar", "--min-api=21", "--r8-jar-path", "../../third_party/r8/d8/lib/r8.jar", "--custom-d8-jar-path", "../../third_party/r8/custom_d8.jar", "--warnings-as-errors", "--incremental-dir", "obj/base/base_shared_preferences_java__dex", "--library", "--class-inputs=[\"obj/base/base_shared_preferences_java.processed.jar\"]", "--desugar", "--classpath", "obj/base/base_shared_preferences_java.javac.jar", "--classpath=@FileArg(gen/base/base_shared_preferences_java.build_config.json:deps_info:javac_full_interface_classpath)", "--desugar-dependencies", "gen/base/base_shared_preferences_java__dex.desugardeps", "--bootclasspath=@FileArg(gen/base/base_shared_preferences_java.build_config.json:android:sdk_jars)" ],
       "depfile": "//out/cronet/gen/base/base_shared_preferences_java__dex.d",
-      "deps": [ "//base:base_java__header", "//base:base_shared_preferences_java__build_config_crbug_908819", "//base:base_shared_preferences_java__compile_java", "//base:base_shared_preferences_java__process_device", "//base:jni_java__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header" ],
+      "deps": [ "//base:base_java__header", "//base:base_shared_preferences_java__build_config_crbug_908819", "//base:base_shared_preferences_java__compile_java", "//base:base_shared_preferences_java__process_device", "//build/android:build_java__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
       "inputs": [ "//third_party/jdk/current/bin/java.chromium", "//third_party/r8/d8/lib/r8.jar", "//third_party/r8/custom_d8.jar", "//out/cronet/obj/base/base_shared_preferences_java.processed.jar", "//out/cronet/obj/base/base_shared_preferences_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/gyp/dex.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/md5_check.py" ],
       "metadata": {
 
@@ -4220,7 +4316,7 @@
    "//base:base_shared_preferences_java__header": {
       "args": [ "--depfile=gen/base/base_shared_preferences_java__header.d", "--generated-dir=gen/base/base_shared_preferences_java/generated_java", "--jar-path=obj/base/base_shared_preferences_java.turbine.jar", "--java-srcjars=[]", "--target-name", "//base:base_shared_preferences_java__header", "--classpath=@FileArg(gen/base/base_shared_preferences_java.build_config.json:android:sdk_interface_jars)", "--classpath=@FileArg(gen/base/base_shared_preferences_java.build_config.json:javac:interface_classpath)", "--processorpath=@FileArg(gen/base/base_shared_preferences_java.build_config.json:javac:processor_classpath)", "--processors=@FileArg(gen/base/base_shared_preferences_java.build_config.json:javac:processor_classes)", "--turbine-jar-path", "../../third_party/turbine/turbine.jar", "--generated-jar-path", "gen/base/base_shared_preferences_java.generated.srcjar", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/base/base_shared_preferences_java.sources" ],
       "depfile": "//out/cronet/gen/base/base_shared_preferences_java__header.d",
-      "deps": [ "//base:base_java__header", "//base:base_shared_preferences_java__build_config_crbug_908819", "//base:jni_java__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header" ],
+      "deps": [ "//base:base_java__header", "//base:base_shared_preferences_java__build_config_crbug_908819", "//build/android:build_java__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
       "inputs": [ "//base/android/java/src/org/chromium/base/shared_preferences/KeyPrefix.java", "//base/android/java/src/org/chromium/base/shared_preferences/KnownPreferenceKeyRegistries.java", "//base/android/java/src/org/chromium/base/shared_preferences/NoOpPreferenceKeyChecker.java", "//base/android/java/src/org/chromium/base/shared_preferences/PreferenceKeyChecker.java", "//base/android/java/src/org/chromium/base/shared_preferences/PreferenceKeyRegistry.java", "//base/android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java", "//base/android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java", "//out/cronet/gen/base/base_shared_preferences_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/base_shared_preferences_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
       "metadata": {
 
@@ -4235,7 +4331,7 @@
    },
    "//base:base_shared_preferences_java__host": {
       "args": [ "--input", "obj/base/base_shared_preferences_java.javac.jar", "--output", "lib.java/base/base_shared_preferences_java.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//base:base_java__host", "//base:base_shared_preferences_java__build_config_crbug_908819", "//base:base_shared_preferences_java__compile_java", "//base:jni_java__host", "//third_party/android_deps:guava_android_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host" ],
+      "deps": [ "//base:base_java__host", "//base:base_shared_preferences_java__build_config_crbug_908819", "//base:base_shared_preferences_java__compile_java", "//build/android:build_java__host", "//third_party/android_deps:guava_android_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
       "inputs": [ "//out/cronet/obj/base/base_shared_preferences_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
       "metadata": {
 
@@ -4250,7 +4346,7 @@
    },
    "//base:base_shared_preferences_java__process_device": {
       "args": [ "--input", "obj/base/base_shared_preferences_java.javac.jar", "--output", "obj/base/base_shared_preferences_java.processed.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//base:base_java__host", "//base:base_shared_preferences_java__build_config_crbug_908819", "//base:base_shared_preferences_java__compile_java", "//base:jni_java__host", "//third_party/android_deps:guava_android_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host" ],
+      "deps": [ "//base:base_java__host", "//base:base_shared_preferences_java__build_config_crbug_908819", "//base:base_shared_preferences_java__compile_java", "//build/android:build_java__host", "//third_party/android_deps:guava_android_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
       "inputs": [ "//out/cronet/obj/base/base_shared_preferences_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
       "metadata": {
 
@@ -4264,7 +4360,7 @@
       "visibility": [ "*" ]
    },
    "//base:base_shared_preferences_java__validate": {
-      "deps": [ "//base:base_java__validate", "//base:jni_java__validate", "//third_party/android_deps:guava_android_java__validate", "//third_party/androidx:androidx_annotation_annotation_java__validate" ],
+      "deps": [ "//base:base_java__validate", "//build/android:build_java__validate", "//third_party/android_deps:guava_android_java__validate", "//third_party/androidx:androidx_annotation_annotation_java__validate", "//third_party/jni_zero:jni_zero_java__validate" ],
       "metadata": {
 
       },
@@ -4275,6 +4371,19 @@
       "visibility": [ "*" ]
    },
    "//base:base_shared_preferences_jni": {
+      "deps": [ "//base:base_shared_preferences_jni__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": false,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base:base_shared_preferences_jni__action": {
       "args": [ "from-source", "--output-dir", "gen/jni_headers/base/base_shared_preferences_jni", "--extra-include", "../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/base/base_shared_preferences_jni.srcjar", "--use-proxy-hash", "--output-name", "SharedPreferencesManager_jni.h", "--input-file=../../base/android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//base/android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -4284,7 +4393,7 @@
       },
       "outputs": [ "//out/cronet/gen/base/base_shared_preferences_jni.srcjar", "//out/cronet/gen/jni_headers/base/base_shared_preferences_jni/SharedPreferencesManager_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -4296,20 +4405,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override", "-I", "../../third_party/libunwindstack/src/libunwindstack/include" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override", "-I", "../../third_party/libunwindstack/src/libunwindstack/include" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config", "//third_party/jni_zero:jni_include_dir", "//third_party/libunwindstack:libunwindstack_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config", "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir", "//third_party/libunwindstack:libunwindstack_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST", "USE_CHROMIUM_BASE" ],
       "deps": [ "//base:base", "//base:base_profiler_test_support_jni", "//base:native_unwinder_android", "//base/test:test_support", "//testing/gtest:gtest" ],
       "externs": {
 
       },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//out/cronet/gen/jni_headers/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/re2/src/", "//out/cronet/gen/jni_headers/" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -4327,20 +4436,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:optimize_max" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
-      "deps": [ "//build:chromeos_buildflags" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:optimize_max" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "deps": [ "//base:fuzzing_buildflags", "//build:chromeos_buildflags" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -4359,20 +4468,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:optimize_max" ],
-      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
-      "deps": [ "//build:chromeos_buildflags(//build/toolchain/linux:clang_x64)" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:optimize_max" ],
+      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "deps": [ "//base:fuzzing_buildflags(//build/toolchain/linux:clang_x64)", "//build:chromeos_buildflags(//build/toolchain/linux:clang_x64)" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Wl,-O2", "-Wl,--gc-sections" ],
       "metadata": {
 
       },
@@ -4555,6 +4664,7 @@
       "metadata": {
          "all_deps": [ "//base:arm_bti_testfunctions", "//base:base", "//base:base_stack_sampling_profiler_test_util", "//base:feature_list_buildflags", "//base:i18n", "//base:partition_alloc_test_support", "//base:path_service_unittest", "//base:sanitizer_buildflags", "//base/allocator:buildflags", "//base/test:native_library_test_utils", "//base/test:proto_test_support", "//base/test:run_all_unittests", "//base/test:test_proto", "//base/test:test_support", "//base/third_party/dynamic_annotations:dynamic_annotations", "//build:blink_buildflags", "//build:chromecast_buildflags", "//build:chromeos_buildflags", "//testing/gmock:gmock", "//testing/gtest:gtest", "//third_party/icu:icu", "//third_party/modp_b64:modp_b64", "//base:base_java_unittest_support", "//base/test:test_support_java", "//third_party/jni_zero:jni_zero", "//base:message_pump_buildflags", "//third_party/libevent:libevent", "//testing/android/native_test:native_test_native_code", "//base:base_nocompile_tests_new", "//base/test:test_support_java", "//base:base_unittests__unwind_assets", "//build/android/gtest_apk:native_test_instrumentation_test_runner_java", "//testing/android/native_test:native_test_java", "//base:base_unittests__apk__secondary_abi_shared_library_list", "//base:base_unittests__apk__shared_library_list", "//base:base_unittests__library__jni_registration", "//base:base_unittests__apk__compile_resources", "//base:base_unittests__apk__native_libraries", "//base:base_unittests__apk__build_config_srcjar" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [  ],
          "target_type": [ "android_apk" ]
       },
@@ -4704,20 +4814,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-DPROTOBUF_ALLOW_DEPRECATED=1", "-Wno-inconsistent-missing-override" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-DPROTOBUF_ALLOW_DEPRECATED=1", "-Wno-inconsistent-missing-override" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/android:hide_all_but_jni", "//build/config/compiler:minimal_symbols", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config", "//build/config/sanitizers:link_shared_library" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//build/config/android:hide_all_but_jni", "//build/config/compiler:minimal_symbols", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config", "//third_party/jni_zero:use_chromium_base_define", "//build/config/sanitizers:link_shared_library" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST", "USE_CHROMIUM_BASE" ],
       "deps": [ "//base:arm_bti_testfunctions", "//base:base", "//base:base_nocompile_tests_new", "//base:base_stack_sampling_profiler_test_util", "//base:feature_list_buildflags", "//base:i18n", "//base:message_pump_buildflags", "//base:partition_alloc_test_support", "//base:path_service_unittest", "//base:sanitizer_buildflags", "//base/allocator:buildflags", "//base/test:immediate_crash_test_helper", "//base/test:native_library_test_utils", "//base/test:proto_test_support", "//base/test:run_all_unittests", "//base/test:test_child_process", "//base/test:test_proto", "//base/test:test_proto_descriptor", "//base/test:test_shared_library", "//base/test:test_support", "//base/third_party/dynamic_annotations:dynamic_annotations", "//build:blink_buildflags", "//build:chromecast_buildflags", "//build:chromeos_buildflags", "//build/config:shared_library_deps", "//testing/android/native_test:native_test_native_code", "//testing/buildbot/filters:base_unittests_filters", "//testing/gmock:gmock", "//testing/gtest:gtest", "//third_party/icu:icu", "//third_party/jni_zero:jni_zero", "//third_party/libevent:libevent", "//third_party/modp_b64:modp_b64" ],
       "externs": {
 
       },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/protobuf/src/", "//out/cronet/gen/protoc_out/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/" ],
-      "ldflags": [ "-LinkWrapper,add-whole-archive=arm_bti_testfunctions.rlib", "-LinkWrapper,add-whole-archive=base.rlib", "-LinkWrapper,add-whole-archive=base_stack_sampling_profiler_test_util.rlib", "-LinkWrapper,add-whole-archive=feature_list_buildflags.rlib", "-LinkWrapper,add-whole-archive=i18n.rlib", "-LinkWrapper,add-whole-archive=partition_alloc_test_support.rlib", "-LinkWrapper,add-whole-archive=path_service_unittest.rlib", "-LinkWrapper,add-whole-archive=sanitizer_buildflags.rlib", "-LinkWrapper,add-whole-archive=buildflags.rlib", "-LinkWrapper,add-whole-archive=native_library_test_utils.rlib", "-LinkWrapper,add-whole-archive=proto_test_support.rlib", "-LinkWrapper,add-whole-archive=run_all_unittests.rlib", "-LinkWrapper,add-whole-archive=test_proto.rlib", "-LinkWrapper,add-whole-archive=test_support.rlib", "-LinkWrapper,add-whole-archive=dynamic_annotations.rlib", "-LinkWrapper,add-whole-archive=blink_buildflags.rlib", "-LinkWrapper,add-whole-archive=chromecast_buildflags.rlib", "-LinkWrapper,add-whole-archive=chromeos_buildflags.rlib", "-LinkWrapper,add-whole-archive=gmock.rlib", "-LinkWrapper,add-whole-archive=gtest.rlib", "-LinkWrapper,add-whole-archive=icu.rlib", "-LinkWrapper,add-whole-archive=modp_b64.rlib", "-LinkWrapper,add-whole-archive=jni_zero.rlib", "-LinkWrapper,add-whole-archive=message_pump_buildflags.rlib", "-LinkWrapper,add-whole-archive=libevent.rlib", "-LinkWrapper,add-whole-archive=native_test_native_code.rlib", "-LinkWrapper,add-whole-archive=base_nocompile_tests_new.rlib", "-LinkWrapper,add-whole-archive=native_test_native_code.rlib", "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../build/android/android_only_jni_exports.lst", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/protobuf/src/", "//out/cronet/gen/protoc_out/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/re2/src/" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../build/android/android_only_jni_exports.lst", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "dl", "m", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
          "shared_libraries": [ "//out/cronet/libbase_unittests__library.so" ]
@@ -4725,7 +4835,7 @@
       "outputs": [ "//out/cronet/libbase_unittests__library.so", "//out/cronet/libbase_unittests__library.so.TOC", "//out/cronet/lib.unstripped/libbase_unittests__library.so", "//out/cronet/lib.unstripped/libbase_unittests__library.so.map.gz" ],
       "public": "*",
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Copt-level=z", "-Zdwarf-version=4", "-Cdebuginfo=1" ],
-      "sources": [ "//base/allocator/dispatcher/dispatcher_unittest.cc", "//base/allocator/dispatcher/initializer_unittest.cc", "//base/allocator/dispatcher/internal/dispatcher_internal_unittest.cc", "//base/allocator/dispatcher/testing/dispatcher_test.cc", "//base/allocator/dispatcher/testing/dispatcher_test.h", "//base/allocator/dispatcher/testing/observer_mock.h", "//base/allocator/dispatcher/testing/tools.h", "//base/allocator/dispatcher/tls_unittest.cc", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_test_support.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_unittest.cc", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ref_unittest.cc", "//base/at_exit_unittest.cc", "//base/atomicops_unittest.cc", "//base/auto_reset_unittest.cc", "//base/barrier_callback_unittest.cc", "//base/barrier_closure_unittest.cc", "//base/base64_unittest.cc", "//base/base64url_unittest.cc", "//base/big_endian_unittest.cc", "//base/bit_cast_unittest.cc", "//base/bits_unittest.cc", "//base/build_time_unittest.cc", "//base/callback_list_unittest.cc", "//base/cancelable_callback_unittest.cc", "//base/check_is_test_unittest.cc", "//base/check_unittest.cc", "//base/command_line_unittest.cc", "//base/component_export_unittest.cc", "//base/containers/adapters_unittest.cc", "//base/containers/buffer_iterator_unittest.cc", "//base/containers/checked_iterators_unittest.cc", "//base/containers/circular_deque_unittest.cc", "//base/containers/contains_unittest.cc", "//base/containers/contiguous_iterator_unittest.cc", "//base/containers/enum_set_unittest.cc", "//base/containers/erase_unittest.cc", "//base/containers/extend_unittest.cc", "//base/containers/fixed_flat_map_unittest.cc", "//base/containers/fixed_flat_set_unittest.cc", "//base/containers/flat_map_unittest.cc", "//base/containers/flat_set_unittest.cc", "//base/containers/flat_tree_unittest.cc", "//base/containers/id_map_unittest.cc", "//base/containers/intrusive_heap_unittest.cc", "//base/containers/linked_list_unittest.cc", "//base/containers/lru_cache_unittest.cc", "//base/containers/map_util_unittest.cc", "//base/containers/small_map_unittest.cc", "//base/containers/span_unittest.cc", "//base/containers/unique_ptr_adapters_unittest.cc", "//base/containers/vector_buffer_unittest.cc", "//base/cpu_unittest.cc", "//base/cxx20_is_constant_evaluated_unittest.cc", "//base/debug/alias_unittest.cc", "//base/debug/asan_service_unittest.cc", "//base/debug/crash_logging_unittest.cc", "//base/debug/debugger_unittest.cc", "//base/debug/dump_without_crashing_unittest.cc", "//base/debug/stack_trace_unittest.cc", "//base/debug/task_trace_unittest.cc", "//base/environment_unittest.cc", "//base/feature_list_unittest.cc", "//base/files/block_tests_writing_to_special_dirs_unittest.cc", "//base/files/file_enumerator_unittest.cc", "//base/files/file_error_or_unittest.cc", "//base/files/file_path_unittest.cc", "//base/files/file_path_watcher_unittest.cc", "//base/files/file_proxy_unittest.cc", "//base/files/file_unittest.cc", "//base/files/file_util_unittest.cc", "//base/files/important_file_writer_cleaner_unittest.cc", "//base/files/important_file_writer_unittest.cc", "//base/files/memory_mapped_file_unittest.cc", "//base/files/safe_base_name_unittest.cc", "//base/files/scoped_temp_dir_unittest.cc", "//base/files/scoped_temp_file_unittest.cc", "//base/functional/bind_unittest.cc", "//base/functional/callback_helpers_unittest.cc", "//base/functional/callback_unittest.cc", "//base/functional/function_ref_unittest.cc", "//base/functional/identity_unittest.cc", "//base/functional/invoke_unittest.cc", "//base/functional/not_fn_unittest.cc", "//base/functional/overloaded_unittest.cc", "//base/gmock_unittest.cc", "//base/hash/hash_unittest.cc", "//base/hash/legacy_hash_unittest.cc", "//base/hash/md5_constexpr_unittest.cc", "//base/hash/md5_unittest.cc", "//base/hash/sha1_unittest.cc", "//base/i18n/break_iterator_unittest.cc", "//base/i18n/case_conversion_unittest.cc", "//base/i18n/char_iterator_unittest.cc", "//base/i18n/character_encoding_unittest.cc", "//base/i18n/file_util_icu_unittest.cc", "//base/i18n/icu_string_conversions_unittest.cc", "//base/i18n/icu_util_unittest.cc", "//base/i18n/message_formatter_unittest.cc", "//base/i18n/number_formatting_unittest.cc", "//base/i18n/rtl_unittest.cc", "//base/i18n/streaming_utf8_validator_unittest.cc", "//base/i18n/string_search_unittest.cc", "//base/i18n/time_formatting_unittest.cc", "//base/i18n/timezone_unittest.cc", "//base/i18n/transliterator_unittest.cc", "//base/immediate_crash_unittest.cc", "//base/json/json_parser_unittest.cc", "//base/json/json_reader_unittest.cc", "//base/json/json_value_converter_unittest.cc", "//base/json/json_value_serializer_unittest.cc", "//base/json/json_writer_unittest.cc", "//base/json/string_escape_unittest.cc", "//base/json/values_util_unittest.cc", "//base/lazy_instance_unittest.cc", "//base/logging_unittest.cc", "//base/memory/aligned_memory_unittest.cc", "//base/memory/discardable_memory_backing_field_trial_unittest.cc", "//base/memory/discardable_shared_memory_unittest.cc", "//base/memory/memory_pressure_listener_unittest.cc", "//base/memory/platform_shared_memory_region_unittest.cc", "//base/memory/ptr_util_unittest.cc", "//base/memory/raw_ptr_asan_unittest.cc", "//base/memory/raw_ptr_chromium_unittest.cc", "//base/memory/raw_span_unittest.cc", "//base/memory/ref_counted_memory_unittest.cc", "//base/memory/ref_counted_unittest.cc", "//base/memory/safe_ref_unittest.cc", "//base/memory/safety_checks_unitttest.cc", "//base/memory/shared_memory_hooks_unittest.cc", "//base/memory/shared_memory_mapping_unittest.cc", "//base/memory/shared_memory_region_unittest.cc", "//base/memory/singleton_unittest.cc", "//base/memory/unsafe_shared_memory_pool_unittest.cc", "//base/memory/values_equivalent_unittest.cc", "//base/memory/weak_auto_reset_unittest.cc", "//base/memory/weak_ptr_unittest.cc", "//base/message_loop/message_pump_unittest.cc", "//base/message_loop/work_id_provider_unittest.cc", "//base/metrics/bucket_ranges_unittest.cc", "//base/metrics/crc32_unittest.cc", "//base/metrics/field_trial_params_unittest.cc", "//base/metrics/field_trial_unittest.cc", "//base/metrics/histogram_base_unittest.cc", "//base/metrics/histogram_delta_serialization_unittest.cc", "//base/metrics/histogram_functions_unittest.cc", "//base/metrics/histogram_macros_unittest.cc", "//base/metrics/histogram_samples_unittest.cc", "//base/metrics/histogram_shared_memory_unittest.cc", "//base/metrics/histogram_snapshot_manager_unittest.cc", "//base/metrics/histogram_threadsafe_unittest.cc", "//base/metrics/histogram_unittest.cc", "//base/metrics/metrics_hashes_unittest.cc", "//base/metrics/persistent_histogram_allocator_unittest.cc", "//base/metrics/persistent_histogram_storage_unittest.cc", "//base/metrics/persistent_memory_allocator_unittest.cc", "//base/metrics/persistent_sample_map_unittest.cc", "//base/metrics/ranges_manager_unittest.cc", "//base/metrics/sample_map_unittest.cc", "//base/metrics/sample_vector_unittest.cc", "//base/metrics/single_sample_metrics_unittest.cc", "//base/metrics/sparse_histogram_unittest.cc", "//base/metrics/statistics_recorder_starvation_unittest.cc", "//base/metrics/statistics_recorder_unittest.cc", "//base/moving_window_unittest.cc", "//base/native_library_unittest.cc", "//base/no_destructor_unittest.cc", "//base/observer_list_threadsafe_unittest.cc", "//base/observer_list_unittest.cc", "//base/one_shot_event_unittest.cc", "//base/parameter_pack_unittest.cc", "//base/pickle_unittest.cc", "//base/power_monitor/battery_level_provider_unittest.cc", "//base/power_monitor/battery_state_sampler_unittest.cc", "//base/power_monitor/power_monitor_device_source_unittest.cc", "//base/power_monitor/power_monitor_unittest.cc", "//base/power_monitor/timer_sampling_event_source_unittest.cc", "//base/process/environment_internal_unittest.cc", "//base/process/memory_unittest.cc", "//base/process/process_metrics_unittest.cc", "//base/profiler/metadata_recorder_unittest.cc", "//base/profiler/module_cache_unittest.cc", "//base/profiler/sample_metadata_unittest.cc", "//base/profiler/stack_buffer_unittest.cc", "//base/profiler/stack_copier_suspend_unittest.cc", "//base/profiler/stack_copier_unittest.cc", "//base/profiler/stack_sampler_unittest.cc", "//base/profiler/stack_sampling_profiler_unittest.cc", "//base/rand_util_unittest.cc", "//base/ranges/algorithm_unittest.cc", "//base/ranges/functional_unittest.cc", "//base/ranges/ranges_unittest.cc", "//base/run_loop_unittest.cc", "//base/safe_numerics_unittest.cc", "//base/sampling_heap_profiler/lock_free_address_hash_set_unittest.cc", "//base/scoped_add_feature_flags_unittest.cc", "//base/scoped_clear_last_error_unittest.cc", "//base/scoped_generic_unittest.cc", "//base/scoped_multi_source_observation_unittest.cc", "//base/scoped_native_library_unittest.cc", "//base/scoped_observation_unittest.cc", "//base/security_unittest.cc", "//base/sequence_checker_unittest.cc", "//base/sequence_token_unittest.cc", "//base/state_transitions_unittest.cc", "//base/std_clamp_unittest.cc", "//base/stl_util_unittest.cc", "//base/strings/abseil_string_number_conversions_unittest.cc", "//base/strings/escape_unittest.cc", "//base/strings/no_trigraphs_unittest.cc", "//base/strings/pattern_unittest.cc", "//base/strings/safe_sprintf_unittest.cc", "//base/strings/strcat_unittest.cc", "//base/strings/string_number_conversions_unittest.cc", "//base/strings/string_piece_unittest.cc", "//base/strings/string_split_unittest.cc", "//base/strings/string_tokenizer_unittest.cc", "//base/strings/string_util_unittest.cc", "//base/strings/stringize_macros_unittest.cc", "//base/strings/stringprintf_unittest.cc", "//base/strings/sys_string_conversions_unittest.cc", "//base/strings/to_string_unittest.cc", "//base/strings/utf_offset_string_conversions_unittest.cc", "//base/strings/utf_string_conversion_utils_unittest.cc", "//base/strings/utf_string_conversions_unittest.cc", "//base/substring_set_matcher/string_pattern_unittest.cc", "//base/substring_set_matcher/substring_set_matcher_unittest.cc", "//base/supports_user_data_unittest.cc", "//base/sync_socket_unittest.cc", "//base/synchronization/atomic_flag_unittest.cc", "//base/synchronization/condition_variable_unittest.cc", "//base/synchronization/lock_unittest.cc", "//base/synchronization/waitable_event_unittest.cc", "//base/synchronization/waitable_event_watcher_unittest.cc", "//base/sys_byteorder_unittest.cc", "//base/system/sys_info_unittest.cc", "//base/system/system_monitor_unittest.cc", "//base/task/bind_post_task_unittest.cc", "//base/task/cancelable_task_tracker_unittest.cc", "//base/task/common/checked_lock_unittest.cc", "//base/task/common/operations_controller_unittest.cc", "//base/task/common/task_annotator_unittest.cc", "//base/task/default_delayed_task_handle_delegate_unittest.cc", "//base/task/deferred_sequenced_task_runner_unittest.cc", "//base/task/delayed_task_handle_unittest.cc", "//base/task/lazy_thread_pool_task_runner_unittest.cc", "//base/task/post_job_unittest.cc", "//base/task/scoped_set_task_priority_for_current_thread_unittest.cc", "//base/task/sequence_manager/atomic_flag_set_unittest.cc", "//base/task/sequence_manager/lazily_deallocated_deque_unittest.cc", "//base/task/sequence_manager/sequence_manager_impl_unittest.cc", "//base/task/sequence_manager/task_order_unittest.cc", "//base/task/sequence_manager/task_queue_selector_unittest.cc", "//base/task/sequence_manager/task_queue_unittest.cc", "//base/task/sequence_manager/test/mock_time_message_pump_unittest.cc", "//base/task/sequence_manager/thread_controller_power_monitor_unittest.cc", "//base/task/sequence_manager/thread_controller_with_message_pump_impl_unittest.cc", "//base/task/sequence_manager/wake_up_queue_unittest.cc", "//base/task/sequence_manager/work_deduplicator_unittest.cc", "//base/task/sequence_manager/work_queue_sets_unittest.cc", "//base/task/sequence_manager/work_queue_unittest.cc", "//base/task/sequenced_task_runner_unittest.cc", "//base/task/single_thread_task_executor_unittest.cc", "//base/task/single_thread_task_runner_unittest.cc", "//base/task/task_runner_unittest.cc", "//base/task/task_traits_unittest.cc", "//base/task/thread_pool/can_run_policy_test.h", "//base/task/thread_pool/delayed_priority_queue_unittest.cc", "//base/task/thread_pool/delayed_task_manager_unittest.cc", "//base/task/thread_pool/environment_config_unittest.cc", "//base/task/thread_pool/job_task_source_unittest.cc", "//base/task/thread_pool/pooled_single_thread_task_runner_manager_unittest.cc", "//base/task/thread_pool/priority_queue_unittest.cc", "//base/task/thread_pool/semaphore/semaphore_unittest.cc", "//base/task/thread_pool/sequence_unittest.cc", "//base/task/thread_pool/service_thread_unittest.cc", "//base/task/thread_pool/task_source_sort_key_unittest.cc", "//base/task/thread_pool/task_tracker_unittest.cc", "//base/task/thread_pool/test_task_factory.cc", "//base/task/thread_pool/test_task_factory.h", "//base/task/thread_pool/test_utils.cc", "//base/task/thread_pool/test_utils.h", "//base/task/thread_pool/thread_group_impl_unittest.cc", "//base/task/thread_pool/thread_group_unittest.cc", "//base/task/thread_pool/thread_pool_impl_unittest.cc", "//base/task/thread_pool/tracked_ref_unittest.cc", "//base/task/thread_pool/worker_thread_set_unittest.cc", "//base/task/thread_pool/worker_thread_unittest.cc", "//base/task/thread_pool_unittest.cc", "//base/template_util_unittest.cc", "//base/test/gmock_callback_support_unittest.cc", "//base/test/gmock_expected_support_unittest.cc", "//base/test/gmock_move_support_unittest.cc", "//base/test/memory/dangling_ptr_instrumentation.cc", "//base/test/memory/dangling_ptr_instrumentation.h", "//base/test/metrics/histogram_enum_reader_unittest.cc", "//base/test/metrics/histogram_tester_unittest.cc", "//base/test/metrics/user_action_tester_unittest.cc", "//base/test/mock_callback_unittest.cc", "//base/test/rectify_callback_unittest.cc", "//base/test/repeating_test_future_unittest.cc", "//base/test/run_until_unittest.cc", "//base/test/scoped_feature_list_unittest.cc", "//base/test/scoped_logging_settings.h", "//base/test/scoped_mock_clock_override_unittest.cc", "//base/test/scoped_mock_time_message_loop_task_runner_unittest.cc", "//base/test/scoped_run_loop_timeout_unittest.cc", "//base/test/task_environment_unittest.cc", "//base/test/test_future_unittest.cc", "//base/test/test_mock_time_task_runner_unittest.cc", "//base/test/test_pending_task_unittest.cc", "//base/test/test_proto_loader_unittest.cc", "//base/test/test_waitable_event_unittest.cc", "//base/test/to_vector_unittest.cc", "//base/third_party/dynamic_annotations/dynamic_annotations_compiletest.cc", "//base/thread_annotations_unittest.cc", "//base/threading/hang_watcher_unittest.cc", "//base/threading/platform_thread_unittest.cc", "//base/threading/post_task_and_reply_impl_unittest.cc", "//base/threading/scoped_blocking_call_unittest.cc", "//base/threading/scoped_thread_priority_unittest.cc", "//base/threading/sequence_bound_unittest.cc", "//base/threading/sequence_local_storage_map_unittest.cc", "//base/threading/sequence_local_storage_slot_unittest.cc", "//base/threading/simple_thread_unittest.cc", "//base/threading/thread_checker_unittest.cc", "//base/threading/thread_collision_warner_unittest.cc", "//base/threading/thread_id_name_manager_unittest.cc", "//base/threading/thread_local_storage_unittest.cc", "//base/threading/thread_local_unittest.cc", "//base/threading/thread_restrictions_unittest.cc", "//base/threading/thread_unittest.cc", "//base/threading/watchdog_unittest.cc", "//base/time/pr_time_unittest.cc", "//base/time/time_delta_from_string_unittest.cc", "//base/time/time_unittest.cc", "//base/timer/elapsed_timer_unittest.cc", "//base/timer/hi_res_timer_manager_unittest.cc", "//base/timer/lap_timer_unittest.cc", "//base/timer/mock_timer_unittest.cc", "//base/timer/timer_unittest.cc", "//base/timer/wall_clock_timer_unittest.cc", "//base/token_unittest.cc", "//base/tools_sanity_unittest.cc", "//base/traits_bag_unittest.cc", "//base/tuple_unittest.cc", "//base/types/cxx23_to_underlying_unittest.cc", "//base/types/expected_macros_unittest.cc", "//base/types/expected_unittest.cc", "//base/types/fixed_array_unittest.cc", "//base/types/id_type_unittest.cc", "//base/types/optional_ref_unittest.cc", "//base/types/optional_unittest.cc", "//base/types/optional_util_unittest.cc", "//base/types/pass_key_unittest.cc", "//base/types/strong_alias_unittest.cc", "//base/types/supports_ostream_operator_unittest.cc", "//base/types/token_type_unittest.cc", "//base/types/variant_util_unittest.cc", "//base/unguessable_token_unittest.cc", "//base/uuid_unittest.cc", "//base/value_iterators_unittest.cc", "//base/values_unittest.cc", "//base/version_unittest.cc", "//base/vlog_unittest.cc", "//base/libcpp_hardening_test.cc", "//base/allocator/partition_allocator/src/partition_alloc/tagging_unittest.cc", "//base/files/dir_reader_posix_unittest.cc", "//base/files/file_descriptor_watcher_posix_unittest.cc", "//base/memory/madv_free_discardable_memory_allocator_posix_unittest.cc", "//base/memory/madv_free_discardable_memory_posix_unittest.cc", "//base/message_loop/fd_watch_controller_posix_unittest.cc", "//base/posix/file_descriptor_shuffle_unittest.cc", "//base/posix/unix_domain_socket_unittest.cc", "//base/profiler/stack_base_address_posix_unittest.cc", "//base/profiler/stack_copier_signal_unittest.cc", "//base/profiler/thread_delegate_posix_unittest.cc", "//base/trace_event/cfi_backtrace_android_unittest.cc", "//base/profiler/chrome_unwind_info_android_unittest.cc", "//base/profiler/chrome_unwinder_android_unittest.cc", "//base/android/android_image_reader_compat_unittest.cc", "//base/android/application_status_listener_unittest.cc", "//base/android/child_process_unittest.cc", "//base/android/content_uri_utils_unittest.cc", "//base/android/jank_metric_uma_recorder_unittest.cc", "//base/android/java_handler_thread_unittest.cc", "//base/android/jni_android_unittest.cc", "//base/android/jni_array_unittest.cc", "//base/android/jni_string_unittest.cc", "//base/android/library_loader/library_prefetcher_unittest.cc", "//base/android/linker/linker_jni.cc", "//base/android/linker/linker_jni.h", "//base/android/linker/linker_unittest.cc", "//base/android/meminfo_dump_provider_unittest.cc", "//base/android/path_utils_unittest.cc", "//base/android/radio_utils_unittest.cc", "//base/android/reached_addresses_bitset_unittest.cc", "//base/android/scoped_java_ref_unittest.cc", "//base/android/sys_utils_unittest.cc", "//base/android/unguessable_token_android_unittest.cc", "//base/os_compat_android_unittest.cc", "//base/message_loop/message_pump_libevent_unittest.cc", "//base/files/file_locking_unittest.cc", "//base/debug/elf_reader_unittest.cc", "//base/debug/proc_maps_linux_unittest.cc", "//base/debug/test_elf_image_builder.cc", "//base/debug/test_elf_image_builder.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc", "//base/sampling_heap_profiler/poisson_allocation_sampler_unittest.cc", "//base/sampling_heap_profiler/sampling_heap_profiler_unittest.cc", "//base/allocator/partition_alloc_support_unittest.cc", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc" ],
+      "sources": [ "//base/allocator/dispatcher/dispatcher_unittest.cc", "//base/allocator/dispatcher/initializer_unittest.cc", "//base/allocator/dispatcher/internal/dispatcher_internal_unittest.cc", "//base/allocator/dispatcher/testing/dispatcher_test.cc", "//base/allocator/dispatcher/testing/dispatcher_test.h", "//base/allocator/dispatcher/testing/observer_mock.h", "//base/allocator/dispatcher/testing/tools.h", "//base/allocator/dispatcher/tls_unittest.cc", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_test_support.h", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_unittest.cc", "//base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ref_unittest.cc", "//base/at_exit_unittest.cc", "//base/atomicops_unittest.cc", "//base/auto_reset_unittest.cc", "//base/barrier_callback_unittest.cc", "//base/barrier_closure_unittest.cc", "//base/base64_unittest.cc", "//base/base64url_unittest.cc", "//base/big_endian_unittest.cc", "//base/bit_cast_unittest.cc", "//base/bits_unittest.cc", "//base/build_time_unittest.cc", "//base/callback_list_unittest.cc", "//base/cancelable_callback_unittest.cc", "//base/check_is_test_unittest.cc", "//base/check_unittest.cc", "//base/command_line_unittest.cc", "//base/component_export_unittest.cc", "//base/containers/adapters_unittest.cc", "//base/containers/buffer_iterator_unittest.cc", "//base/containers/checked_iterators_unittest.cc", "//base/containers/circular_deque_unittest.cc", "//base/containers/contains_unittest.cc", "//base/containers/enum_set_unittest.cc", "//base/containers/erase_unittest.cc", "//base/containers/extend_unittest.cc", "//base/containers/fixed_flat_map_unittest.cc", "//base/containers/fixed_flat_set_unittest.cc", "//base/containers/flat_map_unittest.cc", "//base/containers/flat_set_unittest.cc", "//base/containers/flat_tree_unittest.cc", "//base/containers/id_map_unittest.cc", "//base/containers/intrusive_heap_unittest.cc", "//base/containers/linked_list_unittest.cc", "//base/containers/lru_cache_unittest.cc", "//base/containers/map_util_unittest.cc", "//base/containers/small_map_unittest.cc", "//base/containers/span_unittest.cc", "//base/containers/unique_ptr_adapters_unittest.cc", "//base/containers/vector_buffer_unittest.cc", "//base/cpu_unittest.cc", "//base/debug/alias_unittest.cc", "//base/debug/asan_service_unittest.cc", "//base/debug/crash_logging_unittest.cc", "//base/debug/debugger_unittest.cc", "//base/debug/dump_without_crashing_unittest.cc", "//base/debug/stack_trace_unittest.cc", "//base/debug/task_trace_unittest.cc", "//base/environment_unittest.cc", "//base/feature_list_unittest.cc", "//base/files/block_tests_writing_to_special_dirs_unittest.cc", "//base/files/file_enumerator_unittest.cc", "//base/files/file_error_or_unittest.cc", "//base/files/file_path_unittest.cc", "//base/files/file_path_watcher_unittest.cc", "//base/files/file_proxy_unittest.cc", "//base/files/file_unittest.cc", "//base/files/file_util_unittest.cc", "//base/files/important_file_writer_cleaner_unittest.cc", "//base/files/important_file_writer_unittest.cc", "//base/files/memory_mapped_file_unittest.cc", "//base/files/safe_base_name_unittest.cc", "//base/files/scoped_temp_dir_unittest.cc", "//base/files/scoped_temp_file_unittest.cc", "//base/functional/bind_unittest.cc", "//base/functional/callback_helpers_unittest.cc", "//base/functional/callback_unittest.cc", "//base/functional/function_ref_unittest.cc", "//base/functional/not_fn_unittest.cc", "//base/functional/overloaded_unittest.cc", "//base/gmock_unittest.cc", "//base/hash/hash_unittest.cc", "//base/hash/legacy_hash_unittest.cc", "//base/hash/md5_constexpr_unittest.cc", "//base/hash/md5_unittest.cc", "//base/hash/sha1_unittest.cc", "//base/i18n/break_iterator_unittest.cc", "//base/i18n/case_conversion_unittest.cc", "//base/i18n/char_iterator_unittest.cc", "//base/i18n/character_encoding_unittest.cc", "//base/i18n/file_util_icu_unittest.cc", "//base/i18n/icu_string_conversions_unittest.cc", "//base/i18n/icu_util_unittest.cc", "//base/i18n/message_formatter_unittest.cc", "//base/i18n/number_formatting_unittest.cc", "//base/i18n/rtl_unittest.cc", "//base/i18n/streaming_utf8_validator_unittest.cc", "//base/i18n/string_search_unittest.cc", "//base/i18n/time_formatting_unittest.cc", "//base/i18n/timezone_unittest.cc", "//base/i18n/transliterator_unittest.cc", "//base/immediate_crash_unittest.cc", "//base/json/json_parser_unittest.cc", "//base/json/json_reader_unittest.cc", "//base/json/json_value_converter_unittest.cc", "//base/json/json_value_serializer_unittest.cc", "//base/json/json_writer_unittest.cc", "//base/json/string_escape_unittest.cc", "//base/json/values_util_unittest.cc", "//base/lazy_instance_unittest.cc", "//base/logging_unittest.cc", "//base/memory/aligned_memory_unittest.cc", "//base/memory/discardable_memory_backing_field_trial_unittest.cc", "//base/memory/discardable_shared_memory_unittest.cc", "//base/memory/memory_pressure_listener_unittest.cc", "//base/memory/platform_shared_memory_region_unittest.cc", "//base/memory/ptr_util_unittest.cc", "//base/memory/raw_ptr_asan_unittest.cc", "//base/memory/raw_ptr_chromium_unittest.cc", "//base/memory/raw_span_unittest.cc", "//base/memory/ref_counted_memory_unittest.cc", "//base/memory/ref_counted_unittest.cc", "//base/memory/safe_ref_unittest.cc", "//base/memory/safety_checks_unittest.cc", "//base/memory/shared_memory_hooks_unittest.cc", "//base/memory/shared_memory_mapping_unittest.cc", "//base/memory/shared_memory_region_unittest.cc", "//base/memory/singleton_unittest.cc", "//base/memory/unsafe_shared_memory_pool_unittest.cc", "//base/memory/values_equivalent_unittest.cc", "//base/memory/weak_auto_reset_unittest.cc", "//base/memory/weak_ptr_unittest.cc", "//base/message_loop/message_pump_unittest.cc", "//base/message_loop/work_id_provider_unittest.cc", "//base/metrics/bucket_ranges_unittest.cc", "//base/metrics/crc32_unittest.cc", "//base/metrics/field_trial_params_unittest.cc", "//base/metrics/field_trial_unittest.cc", "//base/metrics/histogram_base_unittest.cc", "//base/metrics/histogram_delta_serialization_unittest.cc", "//base/metrics/histogram_functions_unittest.cc", "//base/metrics/histogram_macros_unittest.cc", "//base/metrics/histogram_samples_unittest.cc", "//base/metrics/histogram_shared_memory_unittest.cc", "//base/metrics/histogram_snapshot_manager_unittest.cc", "//base/metrics/histogram_threadsafe_unittest.cc", "//base/metrics/histogram_unittest.cc", "//base/metrics/metrics_hashes_unittest.cc", "//base/metrics/persistent_histogram_allocator_unittest.cc", "//base/metrics/persistent_histogram_storage_unittest.cc", "//base/metrics/persistent_memory_allocator_unittest.cc", "//base/metrics/persistent_sample_map_unittest.cc", "//base/metrics/ranges_manager_unittest.cc", "//base/metrics/sample_map_unittest.cc", "//base/metrics/sample_vector_unittest.cc", "//base/metrics/single_sample_metrics_unittest.cc", "//base/metrics/sparse_histogram_unittest.cc", "//base/metrics/statistics_recorder_starvation_unittest.cc", "//base/metrics/statistics_recorder_unittest.cc", "//base/moving_window_unittest.cc", "//base/native_library_unittest.cc", "//base/no_destructor_unittest.cc", "//base/observer_list_threadsafe_unittest.cc", "//base/observer_list_unittest.cc", "//base/one_shot_event_unittest.cc", "//base/parameter_pack_unittest.cc", "//base/pickle_unittest.cc", "//base/power_monitor/battery_level_provider_unittest.cc", "//base/power_monitor/battery_state_sampler_unittest.cc", "//base/power_monitor/power_monitor_device_source_unittest.cc", "//base/power_monitor/power_monitor_unittest.cc", "//base/power_monitor/timer_sampling_event_source_unittest.cc", "//base/process/environment_internal_unittest.cc", "//base/process/memory_unittest.cc", "//base/process/process_metrics_unittest.cc", "//base/profiler/metadata_recorder_unittest.cc", "//base/profiler/module_cache_unittest.cc", "//base/profiler/sample_metadata_unittest.cc", "//base/profiler/stack_buffer_unittest.cc", "//base/profiler/stack_copier_suspend_unittest.cc", "//base/profiler/stack_copier_unittest.cc", "//base/profiler/stack_sampler_unittest.cc", "//base/profiler/stack_sampling_profiler_unittest.cc", "//base/rand_util_unittest.cc", "//base/ranges/algorithm_unittest.cc", "//base/ranges/functional_unittest.cc", "//base/ranges/ranges_unittest.cc", "//base/run_loop_unittest.cc", "//base/safe_numerics_unittest.cc", "//base/sampling_heap_profiler/lock_free_address_hash_set_unittest.cc", "//base/scoped_add_feature_flags_unittest.cc", "//base/scoped_clear_last_error_unittest.cc", "//base/scoped_generic_unittest.cc", "//base/scoped_multi_source_observation_unittest.cc", "//base/scoped_native_library_unittest.cc", "//base/scoped_observation_unittest.cc", "//base/security_unittest.cc", "//base/sequence_checker_unittest.cc", "//base/sequence_token_unittest.cc", "//base/state_transitions_unittest.cc", "//base/std_clamp_unittest.cc", "//base/stl_util_unittest.cc", "//base/strings/abseil_string_number_conversions_unittest.cc", "//base/strings/escape_unittest.cc", "//base/strings/levenshtein_distance_unittest.cc", "//base/strings/no_trigraphs_unittest.cc", "//base/strings/pattern_unittest.cc", "//base/strings/safe_sprintf_unittest.cc", "//base/strings/strcat_unittest.cc", "//base/strings/string_number_conversions_unittest.cc", "//base/strings/string_piece_unittest.cc", "//base/strings/string_split_unittest.cc", "//base/strings/string_tokenizer_unittest.cc", "//base/strings/string_util_unittest.cc", "//base/strings/stringize_macros_unittest.cc", "//base/strings/stringprintf_unittest.cc", "//base/strings/sys_string_conversions_unittest.cc", "//base/strings/to_string_unittest.cc", "//base/strings/utf_offset_string_conversions_unittest.cc", "//base/strings/utf_string_conversion_utils_unittest.cc", "//base/strings/utf_string_conversions_unittest.cc", "//base/substring_set_matcher/string_pattern_unittest.cc", "//base/substring_set_matcher/substring_set_matcher_unittest.cc", "//base/supports_user_data_unittest.cc", "//base/sync_socket_unittest.cc", "//base/synchronization/atomic_flag_unittest.cc", "//base/synchronization/condition_variable_unittest.cc", "//base/synchronization/lock_unittest.cc", "//base/synchronization/waitable_event_unittest.cc", "//base/synchronization/waitable_event_watcher_unittest.cc", "//base/sys_byteorder_unittest.cc", "//base/system/sys_info_unittest.cc", "//base/system/system_monitor_unittest.cc", "//base/task/bind_post_task_unittest.cc", "//base/task/cancelable_task_tracker_unittest.cc", "//base/task/common/checked_lock_unittest.cc", "//base/task/common/operations_controller_unittest.cc", "//base/task/common/task_annotator_unittest.cc", "//base/task/default_delayed_task_handle_delegate_unittest.cc", "//base/task/deferred_sequenced_task_runner_unittest.cc", "//base/task/delayed_task_handle_unittest.cc", "//base/task/lazy_thread_pool_task_runner_unittest.cc", "//base/task/post_job_unittest.cc", "//base/task/scoped_set_task_priority_for_current_thread_unittest.cc", "//base/task/sequence_manager/atomic_flag_set_unittest.cc", "//base/task/sequence_manager/lazily_deallocated_deque_unittest.cc", "//base/task/sequence_manager/sequence_manager_impl_unittest.cc", "//base/task/sequence_manager/task_order_unittest.cc", "//base/task/sequence_manager/task_queue_selector_unittest.cc", "//base/task/sequence_manager/task_queue_unittest.cc", "//base/task/sequence_manager/test/mock_time_message_pump_unittest.cc", "//base/task/sequence_manager/thread_controller_power_monitor_unittest.cc", "//base/task/sequence_manager/thread_controller_with_message_pump_impl_unittest.cc", "//base/task/sequence_manager/wake_up_queue_unittest.cc", "//base/task/sequence_manager/work_deduplicator_unittest.cc", "//base/task/sequence_manager/work_queue_sets_unittest.cc", "//base/task/sequence_manager/work_queue_unittest.cc", "//base/task/sequenced_task_runner_unittest.cc", "//base/task/single_thread_task_executor_unittest.cc", "//base/task/single_thread_task_runner_unittest.cc", "//base/task/task_runner_unittest.cc", "//base/task/task_traits_unittest.cc", "//base/task/thread_pool/can_run_policy_test.h", "//base/task/thread_pool/delayed_priority_queue_unittest.cc", "//base/task/thread_pool/delayed_task_manager_unittest.cc", "//base/task/thread_pool/environment_config_unittest.cc", "//base/task/thread_pool/job_task_source_unittest.cc", "//base/task/thread_pool/pooled_single_thread_task_runner_manager_unittest.cc", "//base/task/thread_pool/priority_queue_unittest.cc", "//base/task/thread_pool/semaphore/semaphore_unittest.cc", "//base/task/thread_pool/sequence_unittest.cc", "//base/task/thread_pool/service_thread_unittest.cc", "//base/task/thread_pool/task_source_sort_key_unittest.cc", "//base/task/thread_pool/task_tracker_unittest.cc", "//base/task/thread_pool/test_task_factory.cc", "//base/task/thread_pool/test_task_factory.h", "//base/task/thread_pool/test_utils.cc", "//base/task/thread_pool/test_utils.h", "//base/task/thread_pool/thread_group_impl_unittest.cc", "//base/task/thread_pool/thread_group_unittest.cc", "//base/task/thread_pool/thread_pool_impl_unittest.cc", "//base/task/thread_pool/tracked_ref_unittest.cc", "//base/task/thread_pool/worker_thread_set_unittest.cc", "//base/task/thread_pool/worker_thread_waitable_event_unittest.cc", "//base/task/thread_pool_unittest.cc", "//base/template_util_unittest.cc", "//base/test/gmock_callback_support_unittest.cc", "//base/test/gmock_expected_support_unittest.cc", "//base/test/gmock_move_support_unittest.cc", "//base/test/memory/dangling_ptr_instrumentation.cc", "//base/test/memory/dangling_ptr_instrumentation.h", "//base/test/metrics/histogram_enum_reader_unittest.cc", "//base/test/metrics/histogram_tester_unittest.cc", "//base/test/metrics/user_action_tester_unittest.cc", "//base/test/mock_callback_unittest.cc", "//base/test/rectify_callback_unittest.cc", "//base/test/repeating_test_future_unittest.cc", "//base/test/run_until_unittest.cc", "//base/test/scoped_feature_list_unittest.cc", "//base/test/scoped_logging_settings.h", "//base/test/scoped_mock_clock_override_unittest.cc", "//base/test/scoped_mock_time_message_loop_task_runner_unittest.cc", "//base/test/scoped_run_loop_timeout_unittest.cc", "//base/test/task_environment_unittest.cc", "//base/test/test_future_unittest.cc", "//base/test/test_mock_time_task_runner_unittest.cc", "//base/test/test_pending_task_unittest.cc", "//base/test/test_proto_loader_unittest.cc", "//base/test/test_waitable_event_unittest.cc", "//base/test/to_vector_unittest.cc", "//base/third_party/dynamic_annotations/dynamic_annotations_compiletest.cc", "//base/thread_annotations_unittest.cc", "//base/threading/hang_watcher_unittest.cc", "//base/threading/platform_thread_unittest.cc", "//base/threading/post_task_and_reply_impl_unittest.cc", "//base/threading/scoped_blocking_call_unittest.cc", "//base/threading/scoped_thread_priority_unittest.cc", "//base/threading/sequence_bound_unittest.cc", "//base/threading/sequence_local_storage_map_unittest.cc", "//base/threading/sequence_local_storage_slot_unittest.cc", "//base/threading/simple_thread_unittest.cc", "//base/threading/thread_checker_unittest.cc", "//base/threading/thread_collision_warner_unittest.cc", "//base/threading/thread_id_name_manager_unittest.cc", "//base/threading/thread_local_storage_unittest.cc", "//base/threading/thread_local_unittest.cc", "//base/threading/thread_restrictions_unittest.cc", "//base/threading/thread_unittest.cc", "//base/threading/watchdog_unittest.cc", "//base/time/pr_time_unittest.cc", "//base/time/time_delta_from_string_unittest.cc", "//base/time/time_unittest.cc", "//base/timer/elapsed_timer_unittest.cc", "//base/timer/hi_res_timer_manager_unittest.cc", "//base/timer/lap_timer_unittest.cc", "//base/timer/mock_timer_unittest.cc", "//base/timer/timer_unittest.cc", "//base/timer/wall_clock_timer_unittest.cc", "//base/token_unittest.cc", "//base/tools_sanity_unittest.cc", "//base/traits_bag_unittest.cc", "//base/tuple_unittest.cc", "//base/types/cxx23_to_underlying_unittest.cc", "//base/types/expected_macros_unittest.cc", "//base/types/expected_unittest.cc", "//base/types/fixed_array_unittest.cc", "//base/types/id_type_unittest.cc", "//base/types/is_instantiation_unittest.cc", "//base/types/optional_ref_unittest.cc", "//base/types/optional_unittest.cc", "//base/types/optional_util_unittest.cc", "//base/types/pass_key_unittest.cc", "//base/types/strong_alias_unittest.cc", "//base/types/supports_ostream_operator_unittest.cc", "//base/types/token_type_unittest.cc", "//base/types/variant_util_unittest.cc", "//base/unguessable_token_unittest.cc", "//base/uuid_unittest.cc", "//base/value_iterators_unittest.cc", "//base/values_unittest.cc", "//base/version_unittest.cc", "//base/vlog_unittest.cc", "//base/libcpp_hardening_test.cc", "//base/allocator/partition_allocator/src/partition_alloc/tagging_unittest.cc", "//base/files/dir_reader_posix_unittest.cc", "//base/files/file_descriptor_watcher_posix_unittest.cc", "//base/memory/madv_free_discardable_memory_allocator_posix_unittest.cc", "//base/memory/madv_free_discardable_memory_posix_unittest.cc", "//base/message_loop/fd_watch_controller_posix_unittest.cc", "//base/posix/file_descriptor_shuffle_unittest.cc", "//base/posix/unix_domain_socket_unittest.cc", "//base/profiler/stack_base_address_posix_unittest.cc", "//base/profiler/stack_copier_signal_unittest.cc", "//base/profiler/thread_delegate_posix_unittest.cc", "//base/trace_event/cfi_backtrace_android_unittest.cc", "//base/profiler/chrome_unwind_info_android_unittest.cc", "//base/profiler/chrome_unwinder_android_unittest.cc", "//base/android/android_image_reader_compat_unittest.cc", "//base/android/application_status_listener_unittest.cc", "//base/android/child_process_unittest.cc", "//base/android/content_uri_utils_unittest.cc", "//base/android/jank_metric_uma_recorder_unittest.cc", "//base/android/java_handler_thread_unittest.cc", "//base/android/jni_android_unittest.cc", "//base/android/jni_array_unittest.cc", "//base/android/jni_string_unittest.cc", "//base/android/library_loader/library_prefetcher_unittest.cc", "//base/android/linker/linker_jni.cc", "//base/android/linker/linker_jni.h", "//base/android/linker/linker_unittest.cc", "//base/android/meminfo_dump_provider_unittest.cc", "//base/android/path_utils_unittest.cc", "//base/android/radio_utils_unittest.cc", "//base/android/reached_addresses_bitset_unittest.cc", "//base/android/scoped_java_ref_unittest.cc", "//base/android/sys_utils_unittest.cc", "//base/android/unguessable_token_android_unittest.cc", "//base/os_compat_android_unittest.cc", "//base/message_loop/message_pump_libevent_unittest.cc", "//base/files/file_locking_unittest.cc", "//base/debug/elf_reader_unittest.cc", "//base/debug/proc_maps_linux_unittest.cc", "//base/debug/test_elf_image_builder.cc", "//base/debug/test_elf_image_builder.h", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc", "//base/sampling_heap_profiler/poisson_allocation_sampler_unittest.cc", "//base/sampling_heap_profiler/sampling_heap_profiler_unittest.cc", "//base/allocator/partition_alloc_support_unittest.cc", "//base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": true,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -4875,7 +4985,7 @@
       "visibility": [ "*" ]
    },
    "//base:build_date": {
-      "args": [ "gen/base/generated_build_date.h", "1699011758" ],
+      "args": [ "gen/base/generated_build_date.h", "1705445157" ],
       "deps": [  ],
       "metadata": {
 
@@ -4889,7 +4999,7 @@
       "visibility": [ "*" ]
    },
    "//base:build_date(//build/toolchain/linux:clang_x64)": {
-      "args": [ "clang_x64/gen/base/generated_build_date.h", "1699011758" ],
+      "args": [ "clang_x64/gen/base/generated_build_date.h", "1705445157" ],
       "deps": [  ],
       "metadata": {
 
@@ -4907,20 +5017,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:executable_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/icu:icu_config", "//build/config/sanitizers:link_executable" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:export_dynamic", "//build/config:default_libs", "//build/config:executable_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/icu:icu_config", "//build/config/sanitizers:link_executable" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
       "deps": [ "//base:base", "//build/config:executable_deps", "//build/win:default_exe_manifest", "//third_party/icu:icuuc" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "dl", "m", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -4971,20 +5081,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:executable_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//build/config/sanitizers:link_executable" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:export_dynamic", "//build/config:default_libs", "//build/config:executable_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//build/config/sanitizers:link_executable" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base:base", "//build/config:executable_deps", "//build/win:default_exe_manifest" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "dl", "m", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -5046,20 +5156,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:executable_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//build/config/sanitizers:link_executable" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:export_dynamic", "//build/config:default_libs", "//build/config:executable_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//build/config/sanitizers:link_executable" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base:base", "//build/config:executable_deps" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "dl", "m", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -5158,6 +5268,37 @@
       "type": "group",
       "visibility": [ "*" ]
    },
+   "//base:fuzzing_buildflags": {
+      "args": [ "--output", "base/fuzzing_buildflags.h", "--rulename", "//base:fuzzing_buildflags", "--gen-dir", "gen", "--definitions", "{{response_file_name}}" ],
+      "deps": [ "//build:buildflag_header_h" ],
+      "libs": [ "android_support" ],
+      "metadata": {
+
+      },
+      "outputs": [ "//out/cronet/gen/base/fuzzing_buildflags.h" ],
+      "public": "*",
+      "response_file_contents": [ "--flags", "USE_FUZZING_ENGINE=false" ],
+      "script": "//build/write_buildflag_header.py",
+      "testonly": false,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "action",
+      "visibility": [ "*" ]
+   },
+   "//base:fuzzing_buildflags(//build/toolchain/linux:clang_x64)": {
+      "args": [ "--output", "base/fuzzing_buildflags.h", "--rulename", "//base:fuzzing_buildflags", "--gen-dir", "clang_x64/gen", "--definitions", "{{response_file_name}}" ],
+      "deps": [ "//build:buildflag_header_h(//build/toolchain/linux:clang_x64)" ],
+      "metadata": {
+
+      },
+      "outputs": [ "//out/cronet/clang_x64/gen/base/fuzzing_buildflags.h" ],
+      "public": "*",
+      "response_file_contents": [ "--flags", "USE_FUZZING_ENGINE=false" ],
+      "script": "//build/write_buildflag_header.py",
+      "testonly": false,
+      "toolchain": "//build/toolchain/linux:clang_x64",
+      "type": "action",
+      "visibility": [ "*" ]
+   },
    "//base:generate_file_for_test": {
       "data_keys": [  ],
       "deps": [  ],
@@ -5179,20 +5320,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wexit-time-destructors", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_max", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config" ],
-      "defines": [ "BASE_I18N_IMPLEMENTATION", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:wexit_time_destructors", "//build/config/compiler:optimize_max", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config" ],
+      "defines": [ "BASE_I18N_IMPLEMENTATION", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
       "deps": [ "//base:base", "//base/third_party/dynamic_annotations:dynamic_annotations", "//build:chromecast_buildflags", "//build:chromeos_buildflags", "//third_party/ced:ced", "//third_party/icu:icu" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -5272,97 +5413,25 @@
       "type": "action",
       "visibility": [ "//base:*" ]
    },
-   "//base:jni_java": {
-      "deps": [ "//base:jni_java__build_config_crbug_908819", "//build/android:build_java", "//third_party/jni_zero:jni_zero_java" ],
-      "metadata": {
-         "all_deps": [  ],
-         "target_type": [ "java_library" ]
-      },
-      "public": "*",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "group",
-      "visibility": [ "*" ]
-   },
-   "//base:jni_java__assetres": {
-      "deps": [ "//build/android:build_java__assetres", "//third_party/jni_zero:jni_zero_java__assetres" ],
-      "metadata": {
-
-      },
-      "public": "*",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "group",
-      "visibility": [ "*" ]
-   },
-   "//base:jni_java__build_config_crbug_908819": {
-      "args": [ "--type=group", "--depfile", "gen/base/jni_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/build/android/build_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/base/jni_java.build_config.json", "--gn-target", "//base:jni_java", "--supports-android" ],
-      "depfile": "//out/cronet/gen/base/jni_java__build_config_crbug_908819.d",
-      "deps": [ "//build/android:build_java__build_config_crbug_908819", "//third_party/jni_zero:jni_zero_java__build_config_crbug_908819" ],
-      "inputs": [ "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/jni_zero/jni_zero_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
-      "metadata": {
-
-      },
-      "outputs": [ "//out/cronet/gen/base/jni_java.build_config.json" ],
-      "public": "*",
-      "script": "//build/android/gyp/write_build_config.py",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "action",
-      "visibility": [ "*" ]
-   },
-   "//base:jni_java__header": {
-      "deps": [ "//build/android:build_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
-      "metadata": {
-
-      },
-      "public": "*",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "group",
-      "visibility": [ "*" ]
-   },
-   "//base:jni_java__host": {
-      "deps": [ "//build/android:build_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
-      "metadata": {
-
-      },
-      "public": "*",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "group",
-      "visibility": [ "*" ]
-   },
-   "//base:jni_java__validate": {
-      "deps": [ "//build/android:build_java__validate", "//third_party/jni_zero:jni_zero_java__validate" ],
-      "metadata": {
-
-      },
-      "public": "*",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "group",
-      "visibility": [ "*" ]
-   },
    "//base:json_perftest_decodebench": {
       "all_dependent_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols" ],
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:executable_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//build/config/sanitizers:link_executable" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:export_dynamic", "//build/config:default_libs", "//build/config:executable_config", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//build/config/sanitizers:link_executable" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base:base", "//build/config:executable_deps" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-pie", "-Bdynamic", "-Wl,-z,nocopyreloc", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "dl", "m", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -5386,7 +5455,7 @@
       },
       "outputs": [ "//out/cronet/gen/base/logging_buildflags.h" ],
       "public": "*",
-      "response_file_contents": [ "--flags", "ENABLE_LOG_ERROR_NOT_REACHED=false", "USE_RUNTIME_VLOG=true" ],
+      "response_file_contents": [ "--flags", "ENABLE_LOG_ERROR_NOT_REACHED=false" ],
       "script": "//build/write_buildflag_header.py",
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -5401,7 +5470,7 @@
       },
       "outputs": [ "//out/cronet/clang_x64/gen/base/logging_buildflags.h" ],
       "public": "*",
-      "response_file_contents": [ "--flags", "ENABLE_LOG_ERROR_NOT_REACHED=false", "USE_RUNTIME_VLOG=true" ],
+      "response_file_contents": [ "--flags", "ENABLE_LOG_ERROR_NOT_REACHED=false" ],
       "script": "//build/write_buildflag_header.py",
       "testonly": false,
       "toolchain": "//build/toolchain/linux:clang_x64",
@@ -5444,20 +5513,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-I", "../../third_party/libunwindstack/src/libunwindstack/include" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-I", "../../third_party/libunwindstack/src/libunwindstack/include" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/libunwindstack:libunwindstack_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/libunwindstack:libunwindstack_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base:base", "//third_party/libunwindstack:libunwindstack" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -5476,20 +5545,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
-      "defines": [ "BASE_IMPLEMENTATION", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
+      "defines": [ "BASE_IMPLEMENTATION", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base:base_static" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -5507,20 +5576,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
-      "defines": [ "BASE_IMPLEMENTATION", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
+      "defines": [ "BASE_IMPLEMENTATION", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base:base_static(//build/toolchain/linux:clang_x64)" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "metadata": {
 
       },
@@ -5569,20 +5638,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//base:android_system_libs", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:optimize_speed", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//base:android_system_libs", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [ "//base:base", "//base/allocator/partition_allocator:buildflags", "//build:branding_buildflags", "//build/config/compiler:compiler_buildflags" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -5602,20 +5671,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wno-inconsistent-missing-override" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
       "deps": [ "//base:base", "//base:generate_file_for_test", "//base/test:test_support", "//testing/gtest:gtest" ],
       "externs": {
 
       },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/re2/src/" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -5689,10 +5758,11 @@
       "visibility": [ "*" ]
    },
    "//base:process_launcher_java": {
-      "deps": [ "//base:base_java", "//base:jni_java", "//base:process_launcher_java__assetres", "//base:process_launcher_java__dex", "//base:process_launcher_java__process_device", "//base:process_launcher_java__validate", "//build/android:build_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_collection_collection_java", "//third_party/androidx:androidx_core_core_java" ],
+      "deps": [ "//base:base_java", "//base:process_launcher_java__assetres", "//base:process_launcher_java__dex", "//base:process_launcher_java__process_device", "//base:process_launcher_java__validate", "//build/android:build_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_collection_collection_java", "//third_party/androidx:androidx_core_core_java", "//third_party/jni_zero:jni_zero_java" ],
       "metadata": {
-         "all_deps": [ "//base:base_java", "//base:jni_java", "//build/android:build_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_collection_collection_java", "//third_party/androidx:androidx_core_core_java", "//base:process_launcher_aidl", "//base:process_launcher_jni" ],
+         "all_deps": [ "//base:base_java", "//build/android:build_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_collection_collection_java", "//third_party/androidx:androidx_core_core_java", "//third_party/jni_zero:jni_zero_java", "//base:process_launcher_aidl", "//base:process_launcher_jni" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//base/android/java/src/org/chromium/base/process_launcher/BindService.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java", "//base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java" ],
          "target_type": [ "java_library" ]
       },
@@ -5703,7 +5773,7 @@
       "visibility": [ "*" ]
    },
    "//base:process_launcher_java__assetres": {
-      "deps": [ "//base:base_java__assetres", "//base:jni_java__assetres", "//build/android:build_java__assetres", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__assetres", "//third_party/androidx:androidx_annotation_annotation_experimental_java__assetres", "//third_party/androidx:androidx_annotation_annotation_java__assetres", "//third_party/androidx:androidx_collection_collection_java__assetres", "//third_party/androidx:androidx_core_core_java__assetres" ],
+      "deps": [ "//base:base_java__assetres", "//build/android:build_java__assetres", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__assetres", "//third_party/androidx:androidx_annotation_annotation_experimental_java__assetres", "//third_party/androidx:androidx_annotation_annotation_java__assetres", "//third_party/androidx:androidx_collection_collection_java__assetres", "//third_party/androidx:androidx_core_core_java__assetres", "//third_party/jni_zero:jni_zero_java__assetres" ],
       "metadata": {
 
       },
@@ -5714,10 +5784,10 @@
       "visibility": [ "*" ]
    },
    "//base:process_launcher_java__build_config_crbug_908819": {
-      "args": [ "--type=java_library", "--depfile", "gen/base/process_launcher_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/base/base_java.build_config.json\", \"gen/base/jni_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_experimental_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/androidx/androidx_collection_collection_java.build_config.json\", \"gen/third_party/androidx/androidx_core_core_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/base/process_launcher_java.build_config.json", "--gn-target", "//base:process_launcher_java", "--device-jar-path", "obj/base/process_launcher_java.processed.jar", "--host-jar-path", "lib.java/base/process_launcher_java.jar", "--unprocessed-jar-path", "obj/base/process_launcher_java.javac.jar", "--interface-jar-path", "obj/base/process_launcher_java.turbine.jar", "--dex-path", "obj/base/process_launcher_java.dex.jar", "--supports-android", "--requires-android", "--target-sources-file", "gen/base/process_launcher_java.sources", "--bundled-srcjars=[\"gen/base/process_launcher_aidl.srcjar\", \"gen/base/process_launcher_jni.srcjar\"]" ],
+      "args": [ "--type=java_library", "--depfile", "gen/base/process_launcher_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/base/base_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_experimental_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/androidx/androidx_collection_collection_java.build_config.json\", \"gen/third_party/androidx/androidx_core_core_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/base/process_launcher_java.build_config.json", "--gn-target", "//base:process_launcher_java", "--device-jar-path", "obj/base/process_launcher_java.processed.jar", "--host-jar-path", "lib.java/base/process_launcher_java.jar", "--unprocessed-jar-path", "obj/base/process_launcher_java.javac.jar", "--interface-jar-path", "obj/base/process_launcher_java.turbine.jar", "--dex-path", "obj/base/process_launcher_java.dex.jar", "--supports-android", "--requires-android", "--target-sources-file", "gen/base/process_launcher_java.sources", "--bundled-srcjars=[\"gen/base/process_launcher_aidl.srcjar\", \"gen/base/process_launcher_jni.srcjar\"]" ],
       "depfile": "//out/cronet/gen/base/process_launcher_java__build_config_crbug_908819.d",
-      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:jni_java__build_config_crbug_908819", "//build/android:build_java__build_config_crbug_908819", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_experimental_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819", "//third_party/androidx:androidx_collection_collection_java__build_config_crbug_908819", "//third_party/androidx:androidx_core_core_java__build_config_crbug_908819" ],
-      "inputs": [ "//out/cronet/gen/base/base_java.build_config.json", "//out/cronet/gen/base/jni_java.build_config.json", "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_experimental_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_collection_collection_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_core_core_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
+      "deps": [ "//base:base_java__build_config_crbug_908819", "//build/android:build_java__build_config_crbug_908819", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_experimental_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819", "//third_party/androidx:androidx_collection_collection_java__build_config_crbug_908819", "//third_party/androidx:androidx_core_core_java__build_config_crbug_908819", "//third_party/jni_zero:jni_zero_java__build_config_crbug_908819" ],
+      "inputs": [ "//out/cronet/gen/base/base_java.build_config.json", "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_experimental_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_collection_collection_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_core_core_java.build_config.json", "//out/cronet/gen/third_party/jni_zero/jni_zero_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
       "metadata": {
 
       },
@@ -5732,8 +5802,9 @@
    "//base:process_launcher_java__compile_java": {
       "args": [ "--depfile=gen/base/process_launcher_java__compile_java.d", "--generated-dir=gen/base/process_launcher_java/generated_java", "--jar-path=obj/base/process_launcher_java.javac.jar", "--java-srcjars=[\"gen/base/process_launcher_aidl.srcjar\", \"gen/base/process_launcher_jni.srcjar\", \"gen/base/process_launcher_java.generated.srcjar\"]", "--target-name", "//base:process_launcher_java__compile_java", "--classpath=@FileArg(gen/base/process_launcher_java.build_config.json:android:sdk_interface_jars)", "--header-jar", "obj/base/process_launcher_java.turbine.jar", "--classpath=[\"obj/base/process_launcher_java.turbine.jar\"]", "--classpath=@FileArg(gen/base/process_launcher_java.build_config.json:deps_info:javac_full_interface_classpath)", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/base/process_launcher_java.sources" ],
       "depfile": "//out/cronet/gen/base/process_launcher_java__compile_java.d",
-      "deps": [ "//base:base_java__header", "//base:jni_java__header", "//base:process_launcher_aidl", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_java__header", "//base:process_launcher_jni", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_collection_collection_java__header", "//third_party/androidx:androidx_core_core_java__header" ],
+      "deps": [ "//base:base_java__header", "//base:process_launcher_aidl", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_java__header", "//base:process_launcher_jni", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_collection_collection_java__header", "//third_party/androidx:androidx_core_core_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
       "inputs": [ "//base/android/java/src/org/chromium/base/process_launcher/BindService.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java", "//base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java", "//out/cronet/gen/base/process_launcher_aidl.srcjar", "//out/cronet/gen/base/process_launcher_jni.srcjar", "//out/cronet/gen/base/process_launcher_java.generated.srcjar", "//out/cronet/gen/base/process_launcher_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/process_launcher_java.sources", "//out/cronet/obj/base/process_launcher_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -5748,7 +5819,7 @@
    "//base:process_launcher_java__dex": {
       "args": [ "--depfile", "gen/base/process_launcher_java__dex.d", "--output", "obj/base/process_launcher_java.dex.jar", "--min-api=21", "--r8-jar-path", "../../third_party/r8/d8/lib/r8.jar", "--custom-d8-jar-path", "../../third_party/r8/custom_d8.jar", "--warnings-as-errors", "--incremental-dir", "obj/base/process_launcher_java__dex", "--library", "--class-inputs=[\"obj/base/process_launcher_java.processed.jar\"]", "--desugar", "--classpath", "obj/base/process_launcher_java.javac.jar", "--classpath=@FileArg(gen/base/process_launcher_java.build_config.json:deps_info:javac_full_interface_classpath)", "--desugar-dependencies", "gen/base/process_launcher_java__dex.desugardeps", "--bootclasspath=@FileArg(gen/base/process_launcher_java.build_config.json:android:sdk_jars)" ],
       "depfile": "//out/cronet/gen/base/process_launcher_java__dex.d",
-      "deps": [ "//base:base_java__header", "//base:jni_java__header", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_java__compile_java", "//base:process_launcher_java__process_device", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_collection_collection_java__header", "//third_party/androidx:androidx_core_core_java__header" ],
+      "deps": [ "//base:base_java__header", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_java__compile_java", "//base:process_launcher_java__process_device", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_collection_collection_java__header", "//third_party/androidx:androidx_core_core_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
       "inputs": [ "//third_party/jdk/current/bin/java.chromium", "//third_party/r8/d8/lib/r8.jar", "//third_party/r8/custom_d8.jar", "//out/cronet/obj/base/process_launcher_java.processed.jar", "//out/cronet/obj/base/process_launcher_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/gyp/dex.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/md5_check.py" ],
       "metadata": {
 
@@ -5764,8 +5835,9 @@
    "//base:process_launcher_java__header": {
       "args": [ "--depfile=gen/base/process_launcher_java__header.d", "--generated-dir=gen/base/process_launcher_java/generated_java", "--jar-path=obj/base/process_launcher_java.turbine.jar", "--java-srcjars=[\"gen/base/process_launcher_aidl.srcjar\", \"gen/base/process_launcher_jni.srcjar\"]", "--target-name", "//base:process_launcher_java__header", "--classpath=@FileArg(gen/base/process_launcher_java.build_config.json:android:sdk_interface_jars)", "--classpath=@FileArg(gen/base/process_launcher_java.build_config.json:javac:interface_classpath)", "--processorpath=@FileArg(gen/base/process_launcher_java.build_config.json:javac:processor_classpath)", "--processors=@FileArg(gen/base/process_launcher_java.build_config.json:javac:processor_classes)", "--turbine-jar-path", "../../third_party/turbine/turbine.jar", "--generated-jar-path", "gen/base/process_launcher_java.generated.srcjar", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/base/process_launcher_java.sources" ],
       "depfile": "//out/cronet/gen/base/process_launcher_java__header.d",
-      "deps": [ "//base:base_java__header", "//base:jni_java__header", "//base:process_launcher_aidl", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_jni", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_collection_collection_java__header", "//third_party/androidx:androidx_core_core_java__header" ],
+      "deps": [ "//base:base_java__header", "//base:process_launcher_aidl", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_jni", "//build/android:build_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_collection_collection_java__header", "//third_party/androidx:androidx_core_core_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
       "inputs": [ "//base/android/java/src/org/chromium/base/process_launcher/BindService.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java", "//base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java", "//base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java", "//out/cronet/gen/base/process_launcher_aidl.srcjar", "//out/cronet/gen/base/process_launcher_jni.srcjar", "//out/cronet/gen/base/process_launcher_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/base/process_launcher_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -5779,7 +5851,7 @@
    },
    "//base:process_launcher_java__host": {
       "args": [ "--input", "obj/base/process_launcher_java.javac.jar", "--output", "lib.java/base/process_launcher_java.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//base:base_java__host", "//base:jni_java__host", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_java__compile_java", "//build/android:build_java__host", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java__host", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/androidx:androidx_collection_collection_java__host", "//third_party/androidx:androidx_core_core_java__host" ],
+      "deps": [ "//base:base_java__host", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_java__compile_java", "//build/android:build_java__host", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java__host", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/androidx:androidx_collection_collection_java__host", "//third_party/androidx:androidx_core_core_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
       "inputs": [ "//out/cronet/obj/base/process_launcher_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
       "metadata": {
 
@@ -5794,7 +5866,7 @@
    },
    "//base:process_launcher_java__process_device": {
       "args": [ "--input", "obj/base/process_launcher_java.javac.jar", "--output", "obj/base/process_launcher_java.processed.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//base:base_java__host", "//base:jni_java__host", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_java__compile_java", "//build/android:build_java__host", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java__host", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/androidx:androidx_collection_collection_java__host", "//third_party/androidx:androidx_core_core_java__host" ],
+      "deps": [ "//base:base_java__host", "//base:process_launcher_java__build_config_crbug_908819", "//base:process_launcher_java__compile_java", "//build/android:build_java__host", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java__host", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/androidx:androidx_collection_collection_java__host", "//third_party/androidx:androidx_core_core_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
       "inputs": [ "//out/cronet/obj/base/process_launcher_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
       "metadata": {
 
@@ -5808,7 +5880,7 @@
       "visibility": [ "*" ]
    },
    "//base:process_launcher_java__validate": {
-      "deps": [ "//base:base_java__validate", "//base:jni_java__validate", "//build/android:build_java__validate", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__validate", "//third_party/androidx:androidx_annotation_annotation_experimental_java__validate", "//third_party/androidx:androidx_annotation_annotation_java__validate", "//third_party/androidx:androidx_collection_collection_java__validate", "//third_party/androidx:androidx_core_core_java__validate" ],
+      "deps": [ "//base:base_java__validate", "//build/android:build_java__validate", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__validate", "//third_party/androidx:androidx_annotation_annotation_experimental_java__validate", "//third_party/androidx:androidx_annotation_annotation_java__validate", "//third_party/androidx:androidx_collection_collection_java__validate", "//third_party/androidx:androidx_core_core_java__validate", "//third_party/jni_zero:jni_zero_java__validate" ],
       "metadata": {
 
       },
@@ -5819,6 +5891,19 @@
       "visibility": [ "*" ]
    },
    "//base:process_launcher_jni": {
+      "deps": [ "//base:process_launcher_jni__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": false,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//base:process_launcher_jni__action": {
       "args": [ "from-source", "--output-dir", "gen/jni_headers/base/process_launcher_jni", "--extra-include", "../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/base/process_launcher_jni.srcjar", "--use-proxy-hash", "--output-name", "ChildProcessService_jni.h", "--input-file=../../base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -5828,7 +5913,7 @@
       },
       "outputs": [ "//out/cronet/gen/base/process_launcher_jni.srcjar", "//out/cronet/gen/jni_headers/base/process_launcher_jni/ChildProcessService_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -6083,6 +6168,7 @@
       "metadata": {
          "all_deps": [  ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//build/android/gtest_apk/java/src/org/chromium/build/gtest_apk/NativeTestInstrumentationTestRunner.java", "//build/android/gtest_apk/java/src/org/chromium/build/gtest_apk/NativeTestIntent.java", "//build/android/gtest_apk/java/src/org/chromium/build/gtest_apk/TestStatusIntent.java", "//build/android/gtest_apk/java/src/org/chromium/build/gtest_apk/TestStatusReceiver.java" ],
          "target_type": [ "java_library" ]
       },
@@ -6256,6 +6342,7 @@
       "metadata": {
          "all_deps": [  ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//build/android/pylib/device/commands/java/src/org/chromium/android/commands/unzip/Unzip.java" ],
          "target_type": [ "java_library" ]
       },
@@ -6493,6 +6580,7 @@
       "metadata": {
          "all_deps": [ "//build/android/test/incremental_javac_gn:changing_javagen" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//build/android/java/test/NoSignatureChangeIncrementalJavacTestHelper2.java", "//out/cronet/gen/build/android/test/incremental_javac_gn/test/NoSignatureChangeIncrementalJavacTestHelper.java" ],
          "target_type": [ "java_library" ]
       },
@@ -6654,6 +6742,7 @@
       "metadata": {
          "all_deps": [ "//build/android/test/incremental_javac_gn:no_signature_change_prebuilt_generator" ],
          "jar_path": [ "//out/cronet/gen/build/android/test/incremental_javac_gn/no_signature_change_prebuilt_generator.jar" ],
+         "sdk_version": [ "current" ],
          "source_files": [  ],
          "target_type": [ "java_library" ]
       },
@@ -6821,6 +6910,7 @@
       "metadata": {
          "all_deps": [ "//build/android:build_config_gen", "//build/android:native_libraries_gen" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//build/android/java/src/org/chromium/build/annotations/AlwaysInline.java", "//build/android/java/src/org/chromium/build/annotations/CheckDiscard.java", "//build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java", "//build/android/java/src/org/chromium/build/annotations/DoNotInline.java", "//build/android/java/src/org/chromium/build/annotations/DoNotStripLogs.java", "//build/android/java/src/org/chromium/build/annotations/IdentifierNameString.java", "//build/android/java/src/org/chromium/build/annotations/MockedInTests.java", "//build/android/java/src/org/chromium/build/annotations/UsedByReflection.java" ],
          "target_type": [ "java_library" ]
       },
@@ -7445,20 +7535,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -7694,20 +7784,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -7725,20 +7815,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
-      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release" ],
+      "defines": [ "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "metadata": {
 
       },
@@ -7844,28 +7934,28 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-fstrict-aliasing", "-fPIC", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Werror" ],
+      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-fstrict-aliasing", "-fPIC", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Werror" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden", "-std=c++20", "-fexceptions", "-frtti" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden", "-fexceptions" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//buildtools/third_party/libc++:config", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti" ],
-      "defines": [ "_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))", "LIBCXX_BUILDING_LIBCXXABI", "OFFICIAL_BUILD", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBCPP_BUILDING_LIBRARY" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//buildtools/third_party/libc++:config", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti" ],
+      "defines": [ "_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))", "LIBCXX_BUILDING_LIBCXXABI", "OFFICIAL_BUILD", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBCPP_BUILDING_LIBRARY" ],
       "deps": [ "//buildtools/third_party/libc++abi:libc++abi" ],
       "externs": {
 
       },
       "include_dirs": [ "//third_party/libc++/src/src/", "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
       "inputs": [ "//buildtools/third_party/libc++/__config_site" ],
-      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Werror" ],
+      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Werror" ],
       "libs": [ "android_support" ],
       "metadata": {
 
       },
       "public": "*",
       "rustflags": [ "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Copt-level=z", "-Zdwarf-version=4", "-Cdebuginfo=1", "--cap-lints=allow", "-Dunsafe_op_in_unsafe_fn", "-Dwarnings" ],
-      "sources": [ "//third_party/libc++/src/src/algorithm.cpp", "//third_party/libc++/src/src/any.cpp", "//third_party/libc++/src/src/atomic.cpp", "//third_party/libc++/src/src/barrier.cpp", "//third_party/libc++/src/src/bind.cpp", "//third_party/libc++/src/src/charconv.cpp", "//third_party/libc++/src/src/chrono.cpp", "//third_party/libc++/src/src/condition_variable.cpp", "//third_party/libc++/src/src/condition_variable_destructor.cpp", "//third_party/libc++/src/src/error_category.cpp", "//third_party/libc++/src/src/exception.cpp", "//third_party/libc++/src/src/filesystem/directory_iterator.cpp", "//third_party/libc++/src/src/filesystem/filesystem_error.cpp", "//third_party/libc++/src/src/filesystem/operations.cpp", "//third_party/libc++/src/src/filesystem/path.cpp", "//third_party/libc++/src/src/functional.cpp", "//third_party/libc++/src/src/future.cpp", "//third_party/libc++/src/src/hash.cpp", "//third_party/libc++/src/src/ios.cpp", "//third_party/libc++/src/src/ios.instantiations.cpp", "//third_party/libc++/src/src/iostream.cpp", "//third_party/libc++/src/src/legacy_pointer_safety.cpp", "//third_party/libc++/src/src/locale.cpp", "//third_party/libc++/src/src/memory.cpp", "//third_party/libc++/src/src/mutex.cpp", "//third_party/libc++/src/src/mutex_destructor.cpp", "//third_party/libc++/src/src/new_handler.cpp", "//third_party/libc++/src/src/new_helpers.cpp", "//third_party/libc++/src/src/optional.cpp", "//third_party/libc++/src/src/random.cpp", "//third_party/libc++/src/src/random_shuffle.cpp", "//third_party/libc++/src/src/regex.cpp", "//third_party/libc++/src/src/ryu/d2fixed.cpp", "//third_party/libc++/src/src/ryu/d2s.cpp", "//third_party/libc++/src/src/ryu/f2s.cpp", "//third_party/libc++/src/src/shared_mutex.cpp", "//third_party/libc++/src/src/stdexcept.cpp", "//third_party/libc++/src/src/string.cpp", "//third_party/libc++/src/src/strstream.cpp", "//third_party/libc++/src/src/system_error.cpp", "//third_party/libc++/src/src/thread.cpp", "//third_party/libc++/src/src/typeinfo.cpp", "//third_party/libc++/src/src/valarray.cpp", "//third_party/libc++/src/src/variant.cpp", "//third_party/libc++/src/src/vector.cpp", "//third_party/libc++/src/src/verbose_abort.cpp", "//third_party/libc++/src/src/new.cpp" ],
+      "sources": [ "//third_party/libc++/src/src/algorithm.cpp", "//third_party/libc++/src/src/any.cpp", "//third_party/libc++/src/src/atomic.cpp", "//third_party/libc++/src/src/barrier.cpp", "//third_party/libc++/src/src/bind.cpp", "//third_party/libc++/src/src/call_once.cpp", "//third_party/libc++/src/src/charconv.cpp", "//third_party/libc++/src/src/chrono.cpp", "//third_party/libc++/src/src/condition_variable.cpp", "//third_party/libc++/src/src/condition_variable_destructor.cpp", "//third_party/libc++/src/src/error_category.cpp", "//third_party/libc++/src/src/exception.cpp", "//third_party/libc++/src/src/filesystem/directory_iterator.cpp", "//third_party/libc++/src/src/filesystem/filesystem_error.cpp", "//third_party/libc++/src/src/filesystem/operations.cpp", "//third_party/libc++/src/src/filesystem/path.cpp", "//third_party/libc++/src/src/functional.cpp", "//third_party/libc++/src/src/future.cpp", "//third_party/libc++/src/src/hash.cpp", "//third_party/libc++/src/src/ios.cpp", "//third_party/libc++/src/src/ios.instantiations.cpp", "//third_party/libc++/src/src/iostream.cpp", "//third_party/libc++/src/src/legacy_pointer_safety.cpp", "//third_party/libc++/src/src/locale.cpp", "//third_party/libc++/src/src/memory.cpp", "//third_party/libc++/src/src/mutex.cpp", "//third_party/libc++/src/src/mutex_destructor.cpp", "//third_party/libc++/src/src/new_handler.cpp", "//third_party/libc++/src/src/new_helpers.cpp", "//third_party/libc++/src/src/optional.cpp", "//third_party/libc++/src/src/random.cpp", "//third_party/libc++/src/src/random_shuffle.cpp", "//third_party/libc++/src/src/regex.cpp", "//third_party/libc++/src/src/ryu/d2fixed.cpp", "//third_party/libc++/src/src/ryu/d2s.cpp", "//third_party/libc++/src/src/ryu/f2s.cpp", "//third_party/libc++/src/src/shared_mutex.cpp", "//third_party/libc++/src/src/stdexcept.cpp", "//third_party/libc++/src/src/string.cpp", "//third_party/libc++/src/src/strstream.cpp", "//third_party/libc++/src/src/system_error.cpp", "//third_party/libc++/src/src/thread.cpp", "//third_party/libc++/src/src/typeinfo.cpp", "//third_party/libc++/src/src/valarray.cpp", "//third_party/libc++/src/src/variant.cpp", "//third_party/libc++/src/src/vector.cpp", "//third_party/libc++/src/src/verbose_abort.cpp", "//third_party/libc++/src/src/new.cpp" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -7876,27 +7966,27 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-fstrict-aliasing", "-fPIC", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Werror" ],
+      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-fstrict-aliasing", "-fPIC", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Werror" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden", "-std=c++20", "-fexceptions", "-frtti" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden", "-fexceptions" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//buildtools/third_party/libc++:config", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti" ],
-      "defines": [ "_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))", "LIBCXX_BUILDING_LIBCXXABI", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBCPP_BUILDING_LIBRARY" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//buildtools/third_party/libc++:config", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti" ],
+      "defines": [ "_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))", "LIBCXX_BUILDING_LIBCXXABI", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBCPP_BUILDING_LIBRARY" ],
       "deps": [ "//buildtools/third_party/libc++abi:libc++abi(//build/toolchain/linux:clang_x64)" ],
       "externs": {
 
       },
       "include_dirs": [ "//third_party/libc++/src/src/", "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/" ],
       "inputs": [ "//buildtools/third_party/libc++/__config_site" ],
-      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Werror" ],
+      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Werror" ],
       "metadata": {
 
       },
       "public": "*",
       "rustflags": [ "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=x86_64-unknown-linux-gnu", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Copt-level=3", "-Zdwarf-version=4", "-Cdebuginfo=1", "--cap-lints=allow", "-Dunsafe_op_in_unsafe_fn", "-Dwarnings" ],
-      "sources": [ "//third_party/libc++/src/src/algorithm.cpp", "//third_party/libc++/src/src/any.cpp", "//third_party/libc++/src/src/atomic.cpp", "//third_party/libc++/src/src/barrier.cpp", "//third_party/libc++/src/src/bind.cpp", "//third_party/libc++/src/src/charconv.cpp", "//third_party/libc++/src/src/chrono.cpp", "//third_party/libc++/src/src/condition_variable.cpp", "//third_party/libc++/src/src/condition_variable_destructor.cpp", "//third_party/libc++/src/src/error_category.cpp", "//third_party/libc++/src/src/exception.cpp", "//third_party/libc++/src/src/filesystem/directory_iterator.cpp", "//third_party/libc++/src/src/filesystem/filesystem_error.cpp", "//third_party/libc++/src/src/filesystem/operations.cpp", "//third_party/libc++/src/src/filesystem/path.cpp", "//third_party/libc++/src/src/functional.cpp", "//third_party/libc++/src/src/future.cpp", "//third_party/libc++/src/src/hash.cpp", "//third_party/libc++/src/src/ios.cpp", "//third_party/libc++/src/src/ios.instantiations.cpp", "//third_party/libc++/src/src/iostream.cpp", "//third_party/libc++/src/src/legacy_pointer_safety.cpp", "//third_party/libc++/src/src/locale.cpp", "//third_party/libc++/src/src/memory.cpp", "//third_party/libc++/src/src/mutex.cpp", "//third_party/libc++/src/src/mutex_destructor.cpp", "//third_party/libc++/src/src/new_handler.cpp", "//third_party/libc++/src/src/new_helpers.cpp", "//third_party/libc++/src/src/optional.cpp", "//third_party/libc++/src/src/random.cpp", "//third_party/libc++/src/src/random_shuffle.cpp", "//third_party/libc++/src/src/regex.cpp", "//third_party/libc++/src/src/ryu/d2fixed.cpp", "//third_party/libc++/src/src/ryu/d2s.cpp", "//third_party/libc++/src/src/ryu/f2s.cpp", "//third_party/libc++/src/src/shared_mutex.cpp", "//third_party/libc++/src/src/stdexcept.cpp", "//third_party/libc++/src/src/string.cpp", "//third_party/libc++/src/src/strstream.cpp", "//third_party/libc++/src/src/system_error.cpp", "//third_party/libc++/src/src/thread.cpp", "//third_party/libc++/src/src/typeinfo.cpp", "//third_party/libc++/src/src/valarray.cpp", "//third_party/libc++/src/src/variant.cpp", "//third_party/libc++/src/src/vector.cpp", "//third_party/libc++/src/src/verbose_abort.cpp", "//third_party/libc++/src/src/new.cpp", "//third_party/libc++/src/src/filesystem/directory_entry.cpp", "//third_party/libc++/src/src/filesystem/filesystem_clock.cpp" ],
+      "sources": [ "//third_party/libc++/src/src/algorithm.cpp", "//third_party/libc++/src/src/any.cpp", "//third_party/libc++/src/src/atomic.cpp", "//third_party/libc++/src/src/barrier.cpp", "//third_party/libc++/src/src/bind.cpp", "//third_party/libc++/src/src/call_once.cpp", "//third_party/libc++/src/src/charconv.cpp", "//third_party/libc++/src/src/chrono.cpp", "//third_party/libc++/src/src/condition_variable.cpp", "//third_party/libc++/src/src/condition_variable_destructor.cpp", "//third_party/libc++/src/src/error_category.cpp", "//third_party/libc++/src/src/exception.cpp", "//third_party/libc++/src/src/filesystem/directory_iterator.cpp", "//third_party/libc++/src/src/filesystem/filesystem_error.cpp", "//third_party/libc++/src/src/filesystem/operations.cpp", "//third_party/libc++/src/src/filesystem/path.cpp", "//third_party/libc++/src/src/functional.cpp", "//third_party/libc++/src/src/future.cpp", "//third_party/libc++/src/src/hash.cpp", "//third_party/libc++/src/src/ios.cpp", "//third_party/libc++/src/src/ios.instantiations.cpp", "//third_party/libc++/src/src/iostream.cpp", "//third_party/libc++/src/src/legacy_pointer_safety.cpp", "//third_party/libc++/src/src/locale.cpp", "//third_party/libc++/src/src/memory.cpp", "//third_party/libc++/src/src/mutex.cpp", "//third_party/libc++/src/src/mutex_destructor.cpp", "//third_party/libc++/src/src/new_handler.cpp", "//third_party/libc++/src/src/new_helpers.cpp", "//third_party/libc++/src/src/optional.cpp", "//third_party/libc++/src/src/random.cpp", "//third_party/libc++/src/src/random_shuffle.cpp", "//third_party/libc++/src/src/regex.cpp", "//third_party/libc++/src/src/ryu/d2fixed.cpp", "//third_party/libc++/src/src/ryu/d2s.cpp", "//third_party/libc++/src/src/ryu/f2s.cpp", "//third_party/libc++/src/src/shared_mutex.cpp", "//third_party/libc++/src/src/stdexcept.cpp", "//third_party/libc++/src/src/string.cpp", "//third_party/libc++/src/src/strstream.cpp", "//third_party/libc++/src/src/system_error.cpp", "//third_party/libc++/src/src/thread.cpp", "//third_party/libc++/src/src/typeinfo.cpp", "//third_party/libc++/src/src/valarray.cpp", "//third_party/libc++/src/src/variant.cpp", "//third_party/libc++/src/src/vector.cpp", "//third_party/libc++/src/src/verbose_abort.cpp", "//third_party/libc++/src/src/new.cpp", "//third_party/libc++/src/src/filesystem/directory_entry.cpp", "//third_party/libc++/src/src/filesystem/filesystem_clock.cpp" ],
       "swiftflags": [ "-file-compilation-dir=." ],
       "testonly": false,
       "toolchain": "//build/toolchain/linux:clang_x64",
@@ -7907,20 +7997,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Werror", "-fstrict-aliasing", "-fPIC" ],
+      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Werror", "-fstrict-aliasing", "-fPIC" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden", "-fexceptions", "-frtti", "-std=c++20" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden", "-fexceptions" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti", "//buildtools/third_party/libc++:config", "//build/config/sanitizers:default_sanitizer_flags_but_ubsan_vptr" ],
-      "defines": [ "LIBCXXABI_SILENT_TERMINATE", "OFFICIAL_BUILD", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBCPP_BUILDING_LIBRARY" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti", "//buildtools/third_party/libc++:config", "//build/config/sanitizers:default_sanitizer_flags_but_ubsan_vptr" ],
+      "defines": [ "LIBCXXABI_SILENT_TERMINATE", "OFFICIAL_BUILD", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBCPP_BUILDING_LIBRARY" ],
       "deps": [ "//buildtools/third_party/libunwind:libunwind" ],
       "externs": {
 
       },
       "include_dirs": [ "//third_party/libc++/src/src/", "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Werror" ],
+      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Werror" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -7938,20 +8028,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-m64", "-msse3", "-Wa,-fdebug-compilation-dir,.", "-gdwarf-4", "-g1", "-gdwarf-aranges", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
-      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Werror", "-fstrict-aliasing", "-fPIC" ],
+      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-pthread", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-m64", "-msse3", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-ftrivial-auto-var-init=pattern", "-O2", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fno-omit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Werror", "-fstrict-aliasing", "-fPIC" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden", "-fexceptions", "-frtti", "-std=c++20" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-fvisibility-inlines-hidden", "-fexceptions" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti", "//buildtools/third_party/libc++:config", "//build/config/sanitizers:default_sanitizer_flags_but_ubsan_vptr" ],
-      "defines": [ "LIBCXXABI_SILENT_TERMINATE", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBCPP_BUILDING_LIBRARY" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti", "//buildtools/third_party/libc++:config", "//build/config/sanitizers:default_sanitizer_flags_but_ubsan_vptr" ],
+      "defines": [ "LIBCXXABI_SILENT_TERMINATE", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "OFFICIAL_BUILD", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "CR_SYSROOT_KEY=20230611T210420Z-2", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBCPP_BUILDING_LIBRARY" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//third_party/libc++/src/src/", "//", "//out/cronet/clang_x64/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-rdynamic", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Werror" ],
+      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--undefined-version", "-m64", "-no-canonical-prefixes", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "-nostdlib++", "--sysroot=../../build/linux/debian_bullseye_amd64-sysroot", "-Werror" ],
       "metadata": {
 
       },
@@ -7968,20 +8058,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Werror", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fstrict-aliasing", "-fPIC", "-Wno-unused-function", "-funwind-tables" ],
+      "cflags": [ "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-Wall", "-Wno-unused-variable", "-Wno-c++11-narrowing", "-Wno-unused-but-set-variable", "-Wno-misleading-indentation", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Werror", "-O3", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-fstrict-aliasing", "-fPIC", "-Wno-unused-function", "-funwind-tables" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden", "-fexceptions", "-frtti" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden", "-fexceptions" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti", "//build/config/compiler:optimize_speed", "//buildtools/third_party/libunwind:libunwind_config" ],
-      "defines": [ "_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS", "OFFICIAL_BUILD", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBUNWIND_IS_NATIVE_ONLY" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/compiler:no_chromium_code", "//build/config/compiler:exceptions", "//build/config/compiler:rtti", "//build/config/compiler:optimize_speed", "//buildtools/third_party/libunwind:libunwind_config" ],
+      "defines": [ "_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS", "OFFICIAL_BUILD", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "_LIBUNWIND_IS_NATIVE_ONLY" ],
       "deps": [  ],
       "externs": {
 
       },
       "include_dirs": [ "//third_party/libunwind/src/include/", "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/" ],
-      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Werror", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
+      "ldflags": [ "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Werror", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections" ],
       "libs": [ "android_support" ],
       "metadata": {
 
@@ -8016,6 +8106,7 @@
       "metadata": {
          "all_deps": [ "//third_party/android_deps:protobuf_lite_runtime_java", "//components/cronet/android:base_feature_overrides_java_proto__protoc_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [  ],
          "target_type": [ "java_library" ]
       },
@@ -8162,20 +8253,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/sanitizers:not_fuzzed", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config/sanitizers:not_fuzzed", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
       "deps": [ "//components/cronet/android:base_feature_overrides_proto_gen", "//third_party/protobuf:protobuf_lite" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/protobuf/src/", "//out/cronet/gen/protoc_out/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "libs": [ "android_support", "log" ],
       "metadata": {
 
@@ -8212,26 +8303,26 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//components/cronet/android:hide_all_but_jni_onload_and_cronet", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//net/third_party/quiche:quiche_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//net/third_party/quiche:net_quic_proto_config", "//build/config/sanitizers:link_shared_library" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//build/config:default_libs", "//build/config:shared_library_config", "//components/cronet/android:hide_all_but_jni_onload_and_cronet", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//net/third_party/quiche:quiche_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//net/third_party/quiche:net_quic_proto_config", "//build/config/sanitizers:link_shared_library" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
       "deps": [ "//base:base", "//build/config:shared_library_deps", "//components/cronet/android:cronet_static", "//net:net" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//net/third_party/quiche/overrides/", "//net/third_party/quiche/src/quiche/common/platform/default/", "//net/third_party/quiche/src/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/protobuf/src/", "//out/cronet/gen/protoc_out/", "//out/cronet/gen/net/third_party/quiche/src/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../components/cronet/android/android_only_jni_onload_and_cronet_exports.lst", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,--version-script=../../components/cronet/android/android_only_jni_onload_and_cronet_exports.lst", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "dl", "m", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
-         "shared_libraries": [ "//out/cronet/libcronet.121.0.6103.2.so" ]
+         "shared_libraries": [ "//out/cronet/libcronet.121.0.6167.71.so" ]
       },
-      "output_name": "cronet.121.0.6103.2",
-      "outputs": [ "//out/cronet/libcronet.121.0.6103.2.so", "//out/cronet/libcronet.121.0.6103.2.so.TOC", "//out/cronet/lib.unstripped/libcronet.121.0.6103.2.so", "//out/cronet/lib.unstripped/libcronet.121.0.6103.2.so.map.gz" ],
+      "output_name": "cronet.121.0.6167.71",
+      "outputs": [ "//out/cronet/libcronet.121.0.6167.71.so", "//out/cronet/libcronet.121.0.6167.71.so.TOC", "//out/cronet/lib.unstripped/libcronet.121.0.6167.71.so", "//out/cronet/lib.unstripped/libcronet.121.0.6167.71.so.map.gz" ],
       "public": "*",
       "rustflags": [ "-Dunsafe_op_in_unsafe_fn", "-Dwarnings", "-Cforce-unwind-tables=no", "-Crelocation-model=pic", "-Coverflow-checks=on", "-Cdefault-linker-libraries", "-Zdep-info-omit-d-target", "-Zmacro-backtrace", "-Zremap-cwd-prefix=.", "--color=always", "--target=armv7-linux-androideabi", "-Cembed-bitcode=no", "-Ccodegen-units=1", "-Cpanic=abort", "-Zpanic_abort_tests", "-Copt-level=z", "-Zdwarf-version=4", "-Cdebuginfo=1" ],
       "sources": [ "//components/cronet/android/cronet_jni.cc" ],
@@ -8258,6 +8349,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_api_java", "//third_party/androidx:androidx_annotation_annotation_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/api/src/org/chromium/net/UploadDataProviders.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/ByteArrayCronetCallback.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/ContentTypeParametersParser.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/CronetRequestCompletionListener.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/CronetResponse.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/ImplicitFlowControlCallback.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/InMemoryTransformCronetCallback.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/JsonCronetCallback.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandler.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandlers.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java", "//components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java" ],
          "target_type": [ "java_library" ]
       },
@@ -8388,6 +8480,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:interface_api_version", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/api/src/org/chromium/net/BidirectionalStream.java", "//components/cronet/android/api/src/org/chromium/net/CallbackException.java", "//components/cronet/android/api/src/org/chromium/net/ConnectionMigrationOptions.java", "//components/cronet/android/api/src/org/chromium/net/CronetEngine.java", "//components/cronet/android/api/src/org/chromium/net/CronetException.java", "//components/cronet/android/api/src/org/chromium/net/CronetProvider.java", "//components/cronet/android/api/src/org/chromium/net/DnsOptions.java", "//components/cronet/android/api/src/org/chromium/net/ExperimentalBidirectionalStream.java", "//components/cronet/android/api/src/org/chromium/net/ExperimentalCronetEngine.java", "//components/cronet/android/api/src/org/chromium/net/ExperimentalOptionsTranslatingCronetEngineBuilder.java", "//components/cronet/android/api/src/org/chromium/net/ExperimentalUrlRequest.java", "//components/cronet/android/api/src/org/chromium/net/ICronetEngineBuilder.java", "//components/cronet/android/api/src/org/chromium/net/InlineExecutionProhibitedException.java", "//components/cronet/android/api/src/org/chromium/net/NetworkException.java", "//components/cronet/android/api/src/org/chromium/net/NetworkQualityRttListener.java", "//components/cronet/android/api/src/org/chromium/net/NetworkQualityThroughputListener.java", "//components/cronet/android/api/src/org/chromium/net/QuicException.java", "//components/cronet/android/api/src/org/chromium/net/QuicOptions.java", "//components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java", "//components/cronet/android/api/src/org/chromium/net/UploadDataProvider.java", "//components/cronet/android/api/src/org/chromium/net/UploadDataSink.java", "//components/cronet/android/api/src/org/chromium/net/UrlRequest.java", "//components/cronet/android/api/src/org/chromium/net/UrlResponseInfo.java", "//out/cronet/gen/components/cronet/android/templates/org/chromium/net/ApiVersion.java" ],
          "target_type": [ "java_library" ]
       },
@@ -8518,20 +8611,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
       "deps": [ "//base:base", "//components/cronet/android:base_feature_overrides_proto" ],
       "externs": {
 
       },
       "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/protobuf/src/", "//out/cronet/gen/protoc_out/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -8551,20 +8644,20 @@
       "allow_circular_includes_from": [  ],
       "arflags": [ "-T" ],
       "asmflags": [ "-fPIC", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-std=c11", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-Wa,-fdebug-compilation-dir,.", "-mfpu=vfpv3-d16", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
-      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wno-delayed-template-parsing-in-cxx20", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1", "-Wno-inconsistent-missing-override" ],
+      "cflags": [ "-Wall", "-Wextra", "-Wimplicit-fallthrough", "-Wextra-semi", "-Wunreachable-code-aggressive", "-Wthread-safety", "-Wno-missing-field-initializers", "-Wno-unused-parameter", "-Wno-psabi", "-Wloop-analysis", "-Wno-unneeded-internal-declaration", "-Wenum-compare-conditional", "-Wno-ignored-pragma-optimize", "-Wno-deprecated-builtins", "-Wno-bitfield-constant-conversion", "-Wno-deprecated-this-capture", "-Wno-invalid-offsetof", "-Wno-vla-extension", "-Wno-thread-safety-reference-return", "-Wshadow", "-Werror", "-fno-delete-null-pointer-checks", "-fno-ident", "-fno-strict-aliasing", "-fstack-protector", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fPIC", "-fcolor-diagnostics", "-fmerge-all-constants", "-fcrash-diagnostics-dir=../../tools/clang/crashreports", "-mllvm", "-instcombine-lower-dbg-declare=0", "-mllvm", "-split-threshold-for-reg-with-hint=0", "-ffp-contract=off", "-fcomplete-member-pointers", "-ffunction-sections", "-fno-short-enums", "--target=arm-linux-androideabi21", "-march=armv7-a", "-mfloat-abi=softfp", "-ffile-compilation-dir=.", "-no-canonical-prefixes", "-mfpu=vfpv3-d16", "-mthumb", "-Oz", "-fdata-sections", "-ffunction-sections", "-fno-unique-section-names", "-fno-math-errno", "-mllvm", "-enable-ml-inliner=release", "-fomit-frame-pointer", "-gdwarf-4", "-g1", "-gdwarf-aranges", "-fdebug-info-for-profiling", "-fvisibility=hidden", "-Xclang", "-add-plugin", "-Xclang", "find-bad-constructs", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ref-template-as-trivial-member", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-raw-ptr-to-stack-allocated", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-fix-crbug-1449812", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "raw-ptr-exclude-path=/third_party/dawn/", "-Xclang", "-plugin-arg-find-bad-constructs", "-Xclang", "check-ipc", "-Wheader-hygiene", "-Wstring-conversion", "-Wtautological-overlap-compare", "-DPROTOBUF_ALLOW_DEPRECATED=1", "-Wno-inconsistent-missing-override" ],
       "cflags_c": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_cc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "cflags_objc": [ "-std=c11", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot" ],
       "cflags_objcc": [ "-std=c++20", "-Wno-trigraphs", "-gsimple-template-names", "-fno-exceptions", "-fno-rtti", "-nostdinc++", "-isystem../../third_party/libc++/src/include", "-isystem../../third_party/libc++abi/src/include", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-fvisibility-inlines-hidden" ],
       "check_includes": true,
-      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//testing/gtest:gtest_direct_config" ],
-      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_ENABLE_SAFE_MODE=1", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-9505-g10664813-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=a12821e5f87e0054c1885dc8982cbe53f2c24899", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
+      "configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:release", "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//third_party/google_benchmark:benchmark_config", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//base:android_system_libs", "//base/allocator/partition_allocator/src/partition_alloc:public_includes", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", "//third_party/re2:re2_config", "//testing/gtest:gtest_direct_config" ],
+      "defines": [ "OFFICIAL_BUILD", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FORTIFY_SOURCE=2", "NO_UNWIND_TABLES", "_GNU_SOURCE", "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r25c_1", "CR_CLANG_REVISION=\"llvmorg-18-init-12938-geb1d5065-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=caccdb0407e84357ca6490165e88dcad64e47d17", "TEMP_REBUILD_HACK", "NDEBUG", "NVALGRIND", "DYNAMIC_ANNOTATIONS_ENABLED=0", "BENCHMARK_STATIC_DEFINE", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE", "GTEST_API_=", "GTEST_HAS_POSIX_RE=0", "GTEST_LANG_CXX11=1", "GTEST_HAS_TR1_TUPLE=0", "GTEST_HAS_ABSL=1", "UNIT_TEST" ],
       "deps": [ "//base/test:test_support", "//components/cronet/android:base_feature_overrides_proto", "//components/cronet/android:cronet_base_feature", "//testing/gtest:gtest" ],
       "externs": {
 
       },
-      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//third_party/protobuf/src/", "//out/cronet/gen/protoc_out/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/" ],
-      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
+      "include_dirs": [ "//", "//out/cronet/gen/", "//buildtools/third_party/libc++/", "//third_party/google_benchmark/src/include/", "//third_party/protobuf/src/", "//out/cronet/gen/protoc_out/", "//base/allocator/partition_allocator/src/", "//out/cronet/gen/base/allocator/partition_allocator/src/", "//third_party/abseil-cpp/", "//third_party/boringssl/src/include/", "//third_party/ced/src/", "//third_party/icu/source/common/", "//third_party/icu/source/i18n/", "//third_party/googletest/custom/", "//third_party/googletest/src/googlemock/include/", "//third_party/googletest/src/googletest/include/", "//third_party/re2/src/" ],
+      "ldflags": [ "-Werror", "-fuse-ld=lld", "-Wl,--fatal-warnings", "-Wl,--build-id=sha1", "-fPIC", "-Wl,-z,noexecstack", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,--icf=all", "-Wl,--color-diagnostics", "-Wl,--no-rosegment", "-Wl,--undefined-version", "-Wl,--no-call-graph-profile-sort", "-Wl,--exclude-libs=libvpx_assembly_arm.a", "-Wl,-z,max-page-size=4096", "--target=arm-linux-androideabi21", "-no-canonical-prefixes", "-Wl,--warn-shared-textrel", "-Wl,-O2", "-Wl,--gc-sections", "-Wl,-z,defs", "-Wl,--as-needed", "--unwindlib=none", "-nostdlib++", "--sysroot=../../third_party/android_toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-Wl,-wrap,calloc", "-Wl,-wrap,free", "-Wl,-wrap,malloc", "-Wl,-wrap,memalign", "-Wl,-wrap,posix_memalign", "-Wl,-wrap,pvalloc", "-Wl,-wrap,realloc", "-Wl,-wrap,valloc", "-Wl,-wrap,malloc_usable_size", "-Wl,-wrap,realpath", "-Wl,-wrap,strdup", "-Wl,-wrap,strndup", "-Wl,-wrap,getcwd", "-Wl,-wrap,asprintf", "-Wl,-wrap,vasprintf" ],
       "libs": [ "android_support", "android", "log", "//base/android/library_loader/anchor_functions.lds" ],
       "metadata": {
 
@@ -8580,15 +8673,31 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_combine_proguard_flags": {
-      "args": [ "--output-file", "gen/components/cronet/android/cronet_impl_native_proguard.cfg", "../../base/android/proguard/chromium_code.flags", "../../build/android/chromium_annotations.flags", "../../components/cronet/android/cronet_impl_native_proguard.cfg" ],
-      "deps": [  ],
+      "args": [ "--output_file", "gen/components/cronet/android/cronet_impl_native_proguard.cfg", "--dep_file", "obj/components/cronet/android/cronet_combine_proguard_flags.d", "gen/components/cronet/android/cronet_jni_registration_java.build_config.json", "gen/components/cronet/android/repackage_native_impl.build_config.json", "gen/components/cronet/android/repackage_api.build_config.json" ],
+      "depfile": "//out/cronet/obj/components/cronet/android/cronet_combine_proguard_flags.d",
+      "deps": [ "//components/cronet/android:cronet_jni_registration_java", "//components/cronet/android:cronet_jni_registration_java__build_config_crbug_908819", "//components/cronet/android:repackage_api", "//components/cronet/android:repackage_api__build_config_crbug_908819", "//components/cronet/android:repackage_native_impl", "//components/cronet/android:repackage_native_impl__build_config_crbug_908819" ],
       "metadata": {
 
       },
       "outputs": [ "//out/cronet/gen/components/cronet/android/cronet_impl_native_proguard.cfg" ],
       "public": "*",
       "script": "//components/cronet/tools/generate_proguard_file.py",
-      "sources": [ "//base/android/proguard/chromium_code.flags", "//build/android/chromium_annotations.flags", "//components/cronet/android/cronet_impl_native_proguard.cfg" ],
+      "sources": [ "//out/cronet/gen/components/cronet/android/cronet_jni_registration_java.build_config.json", "//out/cronet/gen/components/cronet/android/repackage_native_impl.build_config.json", "//out/cronet/gen/components/cronet/android/repackage_api.build_config.json" ],
+      "testonly": false,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "action",
+      "visibility": [ "*" ]
+   },
+   "//components/cronet/android:cronet_combined_proguard_flags_golden_test": {
+      "args": [ "--input_generated_file", "gen/components/cronet/android/cronet_impl_native_proguard.cfg", "--input_golden_file", "../../components/cronet/android/cronet_combined_impl_native_proguard_golden.cfg", "--stamp", "gen/components/cronet/android/cronet_combined_proguard_flags_golden_test.stamp" ],
+      "deps": [ "//components/cronet/android:cronet_combine_proguard_flags" ],
+      "metadata": {
+
+      },
+      "outputs": [ "//out/cronet/gen/components/cronet/android/cronet_combined_proguard_flags_golden_test.stamp" ],
+      "public": "*",
+      "script": "//components/cronet/tools/check_combined_proguard_file.py",
+      "sources": [ "//out/cronet/gen/components/cronet/android/cronet_impl_native_proguard.cfg", "//components/cronet/android/cronet_combined_impl_native_proguard_golden.cfg" ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "action",
@@ -8599,6 +8708,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_all_java", "//components/cronet/android:cronet_test_apk_java", "//components/cronet/android:flags_java_proto", "//base:base_java", "//base:base_java_test_support", "//build/android:build_java", "//third_party/android_sdk:android_test_base_java", "//third_party/androidx:androidx_core_core_java", "//third_party/google-truth:google_truth_java", "//third_party/jni_zero:jni_zero_java", "//third_party/junit:junit", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_test_core_java", "//third_party/androidx:androidx_test_ext_junit_java", "//third_party/androidx:androidx_test_runner_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/test/javatests/src/org/chromium/net/ContextInterceptor.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetLoggerTestRule.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetTestRule.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestRequestFinishedListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestUploadDataProvider.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestUrlRequestCallback.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/HttpFlagsInterceptor.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetManifestInterceptor.java" ],
          "target_type": [ "java_library" ]
       },
@@ -8729,6 +8839,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_api_helpers_java", "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_common_javatests", "//components/cronet/android:cronet_impl_common_base_java", "//components/cronet/android:cronet_impl_fake_base_java", "//components/cronet/android:cronet_impl_platform_base_java", "//components/cronet/android:cronet_test_apk_java", "//base:base_java_test_support", "//third_party/android_deps:guava_android_java", "//third_party/android_sdk:android_test_base_java", "//third_party/google-truth:google_truth_java", "//third_party/junit:junit", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_test_core_java", "//third_party/androidx:androidx_test_ext_junit_java", "//third_party/androidx:androidx_test_runner_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/fake/javatests/org/chromium/net/test/FakeCronetControllerTest.java", "//components/cronet/android/fake/javatests/org/chromium/net/test/FakeCronetEngineTest.java", "//components/cronet/android/fake/javatests/org/chromium/net/test/FakeCronetProviderTest.java", "//components/cronet/android/fake/javatests/org/chromium/net/test/FakeUrlRequestTest.java", "//components/cronet/android/fake/javatests/org/chromium/net/test/FakeUrlResponseTest.java", "//components/cronet/android/fake/javatests/org/chromium/net/test/UrlResponseMatcherTest.java" ],
          "target_type": [ "java_library" ]
       },
@@ -8855,9 +8966,9 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_all_java": {
-      "deps": [ "//components/cronet/android:cronet_impl_all_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_aosp_native_base_java", "//components/cronet/android:cronet_impl_common_base_java", "//components/cronet/android:cronet_impl_native_base_java", "//components/cronet/android:cronet_impl_platform_base_java" ],
+      "deps": [ "//components/cronet/android:cronet_impl_all_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java", "//components/cronet/android:cronet_impl_native_base_java", "//components/cronet/android:cronet_impl_platform_base_java", "//components/cronet/android:httpengine_native_provider_base_java" ],
       "metadata": {
-         "all_deps": [ "//components/cronet/android:cronet_impl_aosp_native_base_java", "//components/cronet/android:cronet_impl_common_base_java", "//components/cronet/android:cronet_impl_native_base_java", "//components/cronet/android:cronet_impl_platform_base_java" ],
+         "all_deps": [ "//components/cronet/android:cronet_impl_common_base_java", "//components/cronet/android:cronet_impl_native_base_java", "//components/cronet/android:cronet_impl_platform_base_java", "//components/cronet/android:httpengine_native_provider_base_java" ],
          "target_type": [ "java_library" ]
       },
       "public": "*",
@@ -8867,7 +8978,7 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_all_java__assetres": {
-      "deps": [ "//components/cronet/android:cronet_impl_aosp_native_base_java__assetres", "//components/cronet/android:cronet_impl_common_base_java__assetres", "//components/cronet/android:cronet_impl_native_base_java__assetres", "//components/cronet/android:cronet_impl_platform_base_java__assetres" ],
+      "deps": [ "//components/cronet/android:cronet_impl_common_base_java__assetres", "//components/cronet/android:cronet_impl_native_base_java__assetres", "//components/cronet/android:cronet_impl_platform_base_java__assetres", "//components/cronet/android:httpengine_native_provider_base_java__assetres" ],
       "metadata": {
 
       },
@@ -8878,10 +8989,10 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_all_java__build_config_crbug_908819": {
-      "args": [ "--type=group", "--depfile", "gen/components/cronet/android/cronet_impl_all_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_common_base_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_native_base_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_platform_base_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_impl_all_java.build_config.json", "--gn-target", "//components/cronet/android:cronet_impl_all_java", "--supports-android" ],
+      "args": [ "--type=group", "--depfile", "gen/components/cronet/android/cronet_impl_all_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/components/cronet/android/cronet_impl_common_base_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_native_base_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_platform_base_java.build_config.json\", \"gen/components/cronet/android/httpengine_native_provider_base_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_impl_all_java.build_config.json", "--gn-target", "//components/cronet/android:cronet_impl_all_java", "--supports-android" ],
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_all_java__build_config_crbug_908819.d",
-      "deps": [ "//components/cronet/android:cronet_impl_aosp_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_platform_base_java__build_config_crbug_908819" ],
-      "inputs": [ "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_impl_platform_base_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
+      "deps": [ "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_platform_base_java__build_config_crbug_908819", "//components/cronet/android:httpengine_native_provider_base_java__build_config_crbug_908819" ],
+      "inputs": [ "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_impl_platform_base_java.build_config.json", "//out/cronet/gen/components/cronet/android/httpengine_native_provider_base_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
       "metadata": {
 
       },
@@ -8894,7 +9005,7 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_all_java__header": {
-      "deps": [ "//components/cronet/android:cronet_impl_aosp_native_base_java__header", "//components/cronet/android:cronet_impl_common_base_java__header", "//components/cronet/android:cronet_impl_native_base_java__header", "//components/cronet/android:cronet_impl_platform_base_java__header" ],
+      "deps": [ "//components/cronet/android:cronet_impl_common_base_java__header", "//components/cronet/android:cronet_impl_native_base_java__header", "//components/cronet/android:cronet_impl_platform_base_java__header", "//components/cronet/android:httpengine_native_provider_base_java__header" ],
       "metadata": {
 
       },
@@ -8905,7 +9016,7 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_all_java__host": {
-      "deps": [ "//components/cronet/android:cronet_impl_aosp_native_base_java__host", "//components/cronet/android:cronet_impl_common_base_java__host", "//components/cronet/android:cronet_impl_native_base_java__host", "//components/cronet/android:cronet_impl_platform_base_java__host" ],
+      "deps": [ "//components/cronet/android:cronet_impl_common_base_java__host", "//components/cronet/android:cronet_impl_native_base_java__host", "//components/cronet/android:cronet_impl_platform_base_java__host", "//components/cronet/android:httpengine_native_provider_base_java__host" ],
       "metadata": {
 
       },
@@ -8916,137 +9027,7 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_all_java__validate": {
-      "deps": [ "//components/cronet/android:cronet_impl_aosp_native_base_java__validate", "//components/cronet/android:cronet_impl_common_base_java__validate", "//components/cronet/android:cronet_impl_native_base_java__validate", "//components/cronet/android:cronet_impl_platform_base_java__validate" ],
-      "metadata": {
-
-      },
-      "public": "*",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "group",
-      "visibility": [ "*" ]
-   },
-   "//components/cronet/android:cronet_impl_aosp_native_base_java": {
-      "deps": [ "//base:base_java", "//build/android:build_java", "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_aosp_native_base_java__assetres", "//components/cronet/android:cronet_impl_aosp_native_base_java__dex", "//components/cronet/android:cronet_impl_aosp_native_base_java__process_device", "//components/cronet/android:cronet_impl_aosp_native_base_java__validate", "//components/cronet/android:cronet_impl_common_base_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_core_core_java", "//third_party/jni_zero:jni_zero_java" ],
-      "metadata": {
-         "all_deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_common_base_java", "//base:base_java", "//build/android:build_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_core_core_java", "//third_party/jni_zero:jni_zero_java" ],
-         "jar_path": [ "" ],
-         "source_files": [ "//components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamBuilderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidCallbackExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHeaderBlockWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineBuilderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidNetworkExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidQuicExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUploadDataSinkWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestBuilderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlResponseInfoWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamCallbackWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionTranslationUtils.java", "//components/cronet/android/java/src/org/chromium/net/impl/PlatformCronetProvider.java", "//components/cronet/android/java/src/org/chromium/net/impl/UploadDataProviderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestCallbackWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestStatusListenerWrapper.java" ],
-         "target_type": [ "java_library" ]
-      },
-      "public": "*",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "group",
-      "visibility": [ "*" ]
-   },
-   "//components/cronet/android:cronet_impl_aosp_native_base_java__assetres": {
-      "deps": [ "//base:base_java__assetres", "//build/android:build_java__assetres", "//components/cronet/android:cronet_api_java__assetres", "//components/cronet/android:cronet_impl_common_base_java__assetres", "//third_party/androidx:androidx_annotation_annotation_java__assetres", "//third_party/androidx:androidx_core_core_java__assetres", "//third_party/jni_zero:jni_zero_java__assetres" ],
-      "metadata": {
-
-      },
-      "public": "*",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "group",
-      "visibility": [ "*" ]
-   },
-   "//components/cronet/android:cronet_impl_aosp_native_base_java__build_config_crbug_908819": {
-      "args": [ "--type=java_library", "--depfile", "gen/components/cronet/android/cronet_impl_aosp_native_base_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/components/cronet/android/cronet_api_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_common_base_java.build_config.json\", \"gen/base/base_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/androidx/androidx_core_core_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json", "--gn-target", "//components/cronet/android:cronet_impl_aosp_native_base_java", "--device-jar-path", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.processed.jar", "--host-jar-path", "lib.java/components/cronet/android/cronet_impl_aosp_native_base_java.jar", "--unprocessed-jar-path", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar", "--interface-jar-path", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.turbine.jar", "--dex-path", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.dex.jar", "--supports-android", "--requires-android", "--target-sources-file", "gen/components/cronet/android/cronet_impl_aosp_native_base_java.sources", "--bundled-srcjars=[]" ],
-      "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java__build_config_crbug_908819.d",
-      "deps": [ "//base:base_java__build_config_crbug_908819", "//build/android:build_java__build_config_crbug_908819", "//components/cronet/android:cronet_api_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819", "//third_party/androidx:androidx_core_core_java__build_config_crbug_908819", "//third_party/jni_zero:jni_zero_java__build_config_crbug_908819" ],
-      "inputs": [ "//out/cronet/gen/components/cronet/android/cronet_api_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "//out/cronet/gen/base/base_java.build_config.json", "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_core_core_java.build_config.json", "//out/cronet/gen/third_party/jni_zero/jni_zero_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
-      "metadata": {
-
-      },
-      "outputs": [ "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json" ],
-      "public": "*",
-      "script": "//build/android/gyp/write_build_config.py",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "action",
-      "visibility": [ "*" ]
-   },
-   "//components/cronet/android:cronet_impl_aosp_native_base_java__compile_java": {
-      "args": [ "--depfile=gen/components/cronet/android/cronet_impl_aosp_native_base_java__compile_java.d", "--generated-dir=gen/components/cronet/android/cronet_impl_aosp_native_base_java/generated_java", "--jar-path=obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar", "--java-srcjars=[\"gen/components/cronet/android/cronet_impl_aosp_native_base_java.generated.srcjar\"]", "--target-name", "//components/cronet/android:cronet_impl_aosp_native_base_java__compile_java", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json:android:sdk_interface_jars)", "--header-jar", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.turbine.jar", "--classpath=[\"obj/components/cronet/android/cronet_impl_aosp_native_base_java.turbine.jar\"]", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json:deps_info:javac_full_interface_classpath)", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/components/cronet/android/cronet_impl_aosp_native_base_java.sources" ],
-      "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java__compile_java.d",
-      "deps": [ "//base:base_java__header", "//build/android:build_java__header", "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_aosp_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_aosp_native_base_java__header", "//components/cronet/android:cronet_impl_common_base_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_core_core_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
-      "inputs": [ "//components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamBuilderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidCallbackExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHeaderBlockWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineBuilderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidNetworkExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidQuicExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUploadDataSinkWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestBuilderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlResponseInfoWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamCallbackWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionTranslationUtils.java", "//components/cronet/android/java/src/org/chromium/net/impl/PlatformCronetProvider.java", "//components/cronet/android/java/src/org/chromium/net/impl/UploadDataProviderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestCallbackWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestStatusListenerWrapper.java", "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java.generated.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java.sources", "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
-      "metadata": {
-
-      },
-      "outputs": [ "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar", "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar.info" ],
-      "public": "*",
-      "script": "//build/android/gyp/compile_java.py",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "action",
-      "visibility": [ "*" ]
-   },
-   "//components/cronet/android:cronet_impl_aosp_native_base_java__dex": {
-      "args": [ "--depfile", "gen/components/cronet/android/cronet_impl_aosp_native_base_java__dex.d", "--output", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.dex.jar", "--min-api=21", "--r8-jar-path", "../../third_party/r8/d8/lib/r8.jar", "--custom-d8-jar-path", "../../third_party/r8/custom_d8.jar", "--warnings-as-errors", "--incremental-dir", "obj/components/cronet/android/cronet_impl_aosp_native_base_java__dex", "--library", "--class-inputs=[\"obj/components/cronet/android/cronet_impl_aosp_native_base_java.processed.jar\"]", "--desugar", "--classpath", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json:deps_info:javac_full_interface_classpath)", "--desugar-dependencies", "gen/components/cronet/android/cronet_impl_aosp_native_base_java__dex.desugardeps", "--bootclasspath=@FileArg(gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json:android:sdk_jars)" ],
-      "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java__dex.d",
-      "deps": [ "//base:base_java__header", "//build/android:build_java__header", "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_aosp_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_aosp_native_base_java__compile_java", "//components/cronet/android:cronet_impl_aosp_native_base_java__process_device", "//components/cronet/android:cronet_impl_common_base_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_core_core_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
-      "inputs": [ "//third_party/jdk/current/bin/java.chromium", "//third_party/r8/d8/lib/r8.jar", "//third_party/r8/custom_d8.jar", "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.processed.jar", "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/gyp/dex.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/md5_check.py" ],
-      "metadata": {
-
-      },
-      "outputs": [ "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.dex.jar" ],
-      "public": "*",
-      "script": "//build/android/gyp/dex.py",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "action",
-      "visibility": [ "*" ]
-   },
-   "//components/cronet/android:cronet_impl_aosp_native_base_java__header": {
-      "args": [ "--depfile=gen/components/cronet/android/cronet_impl_aosp_native_base_java__header.d", "--generated-dir=gen/components/cronet/android/cronet_impl_aosp_native_base_java/generated_java", "--jar-path=obj/components/cronet/android/cronet_impl_aosp_native_base_java.turbine.jar", "--java-srcjars=[]", "--target-name", "//components/cronet/android:cronet_impl_aosp_native_base_java__header", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json:android:sdk_interface_jars)", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json:javac:interface_classpath)", "--processorpath=@FileArg(gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json:javac:processor_classpath)", "--processors=@FileArg(gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json:javac:processor_classes)", "--turbine-jar-path", "../../third_party/turbine/turbine.jar", "--generated-jar-path", "gen/components/cronet/android/cronet_impl_aosp_native_base_java.generated.srcjar", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/components/cronet/android/cronet_impl_aosp_native_base_java.sources" ],
-      "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java__header.d",
-      "deps": [ "//base:base_java__header", "//build/android:build_java__header", "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_aosp_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/androidx:androidx_core_core_java__header", "//third_party/jni_zero:jni_zero_java__header" ],
-      "inputs": [ "//components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamBuilderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidBidirectionalStreamWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidCallbackExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHeaderBlockWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineBuilderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpEngineWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidHttpExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidNetworkExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidQuicExceptionWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUploadDataSinkWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestBuilderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlRequestWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/AndroidUrlResponseInfoWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamCallbackWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionTranslationUtils.java", "//components/cronet/android/java/src/org/chromium/net/impl/PlatformCronetProvider.java", "//components/cronet/android/java/src/org/chromium/net/impl/UploadDataProviderWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestCallbackWrapper.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestStatusListenerWrapper.java", "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
-      "metadata": {
-
-      },
-      "outputs": [ "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.turbine.jar", "//out/cronet/gen/components/cronet/android/cronet_impl_aosp_native_base_java.generated.srcjar" ],
-      "public": "*",
-      "script": "//build/android/gyp/turbine.py",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "action",
-      "visibility": [ "*" ]
-   },
-   "//components/cronet/android:cronet_impl_aosp_native_base_java__host": {
-      "args": [ "--input", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar", "--output", "lib.java/components/cronet/android/cronet_impl_aosp_native_base_java.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//base:base_java__host", "//build/android:build_java__host", "//components/cronet/android:cronet_api_java__host", "//components/cronet/android:cronet_impl_aosp_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_aosp_native_base_java__compile_java", "//components/cronet/android:cronet_impl_common_base_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/androidx:androidx_core_core_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
-      "inputs": [ "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
-      "metadata": {
-
-      },
-      "outputs": [ "//out/cronet/lib.java/components/cronet/android/cronet_impl_aosp_native_base_java.jar" ],
-      "public": "*",
-      "script": "//build/android/gyp/filter_zip.py",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "action",
-      "visibility": [ "*" ]
-   },
-   "//components/cronet/android:cronet_impl_aosp_native_base_java__process_device": {
-      "args": [ "--input", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar", "--output", "obj/components/cronet/android/cronet_impl_aosp_native_base_java.processed.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//base:base_java__host", "//build/android:build_java__host", "//components/cronet/android:cronet_api_java__host", "//components/cronet/android:cronet_impl_aosp_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_aosp_native_base_java__compile_java", "//components/cronet/android:cronet_impl_common_base_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host", "//third_party/androidx:androidx_core_core_java__host", "//third_party/jni_zero:jni_zero_java__host" ],
-      "inputs": [ "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
-      "metadata": {
-
-      },
-      "outputs": [ "//out/cronet/obj/components/cronet/android/cronet_impl_aosp_native_base_java.processed.jar" ],
-      "public": "*",
-      "script": "//build/android/gyp/filter_zip.py",
-      "testonly": false,
-      "toolchain": "//build/toolchain/android:android_clang_arm",
-      "type": "action",
-      "visibility": [ "*" ]
-   },
-   "//components/cronet/android:cronet_impl_aosp_native_base_java__validate": {
-      "deps": [ "//base:base_java__validate", "//build/android:build_java__validate", "//components/cronet/android:cronet_api_java__validate", "//components/cronet/android:cronet_impl_common_base_java__validate", "//third_party/androidx:androidx_annotation_annotation_java__validate", "//third_party/androidx:androidx_core_core_java__validate", "//third_party/jni_zero:jni_zero_java__validate" ],
+      "deps": [ "//components/cronet/android:cronet_impl_common_base_java__validate", "//components/cronet/android:cronet_impl_native_base_java__validate", "//components/cronet/android:cronet_impl_platform_base_java__validate", "//components/cronet/android:httpengine_native_provider_base_java__validate" ],
       "metadata": {
 
       },
@@ -9057,11 +9038,12 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_common_base_java": {
-      "deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_common_base_java__assetres", "//components/cronet/android:cronet_impl_common_base_java__dex", "//components/cronet/android:cronet_impl_common_base_java__process_device", "//components/cronet/android:cronet_impl_common_base_java__validate", "//components/cronet/android:implementation_api_version", "//net/android:net_thread_stats_uid_java", "//third_party/androidx:androidx_annotation_annotation_java" ],
+      "deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_common_base_java__assetres", "//components/cronet/android:cronet_impl_common_base_java__dex", "//components/cronet/android:cronet_impl_common_base_java__process_device", "//components/cronet/android:cronet_impl_common_base_java__validate", "//components/cronet/android:cronet_stats_log_java", "//components/cronet/android:implementation_api_version", "//net/android:net_thread_stats_uid_java", "//third_party/androidx:androidx_annotation_annotation_java" ],
       "metadata": {
-         "all_deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:implementation_api_version", "//third_party/androidx:androidx_annotation_annotation_java", "//net/android:net_thread_stats_uid_java", "//components/cronet/android:http_cache_type_java", "//components/cronet/android:load_states_list", "//components/cronet/android:rtt_throughput_values_java", "//net:effective_connection_type_java" ],
+         "all_deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:implementation_api_version", "//third_party/androidx:androidx_annotation_annotation_java", "//components/cronet/android:cronet_stats_log_java", "//net/android:net_thread_stats_uid_java", "//components/cronet/android:http_cache_type_java", "//components/cronet/android:load_states_list", "//components/cronet/android:rtt_throughput_values_java", "//net:effective_connection_type_java" ],
          "jar_path": [ "" ],
-         "source_files": [ "//components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLoggerFactory.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetManifest.java", "//components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java", "//components/cronet/android/java/src/org/chromium/net/impl/QuicExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/RefCountDelegate.java", "//components/cronet/android/java/src/org/chromium/net/impl/RequestFinishedInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java", "//components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java", "//out/cronet/gen/components/cronet/android/templates/org/chromium/net/impl/ImplVersion.java" ],
+         "sdk_version": [ "current" ],
+         "source_files": [ "//components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLoggerFactory.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetManifest.java", "//components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java", "//components/cronet/android/java/src/org/chromium/net/impl/QuicExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/RefCountDelegate.java", "//components/cronet/android/java/src/org/chromium/net/impl/RequestFinishedInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java", "//components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/CronetLoggerImpl.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/ExperimentalOptions.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/RateLimiter.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/SizeBuckets.java", "//out/cronet/gen/components/cronet/android/templates/org/chromium/net/impl/ImplVersion.java" ],
          "target_type": [ "java_library" ]
       },
       "public": "*",
@@ -9071,7 +9053,7 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_common_base_java__assetres": {
-      "deps": [ "//components/cronet/android:cronet_api_java__assetres", "//net/android:net_thread_stats_uid_java__assetres", "//third_party/androidx:androidx_annotation_annotation_java__assetres" ],
+      "deps": [ "//components/cronet/android:cronet_api_java__assetres", "//components/cronet/android:cronet_stats_log_java__assetres", "//net/android:net_thread_stats_uid_java__assetres", "//third_party/androidx:androidx_annotation_annotation_java__assetres" ],
       "metadata": {
 
       },
@@ -9082,10 +9064,10 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819": {
-      "args": [ "--type=java_library", "--depfile", "gen/components/cronet/android/cronet_impl_common_base_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/components/cronet/android/cronet_api_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/net/android/net_thread_stats_uid_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "--gn-target", "//components/cronet/android:cronet_impl_common_base_java", "--device-jar-path", "obj/components/cronet/android/cronet_impl_common_base_java.processed.jar", "--host-jar-path", "lib.java/components/cronet/android/cronet_impl_common_base_java.jar", "--unprocessed-jar-path", "obj/components/cronet/android/cronet_impl_common_base_java.javac.jar", "--interface-jar-path", "obj/components/cronet/android/cronet_impl_common_base_java.turbine.jar", "--dex-path", "obj/components/cronet/android/cronet_impl_common_base_java.dex.jar", "--supports-android", "--requires-android", "--target-sources-file", "gen/components/cronet/android/cronet_impl_common_base_java.sources", "--bundled-srcjars=[\"gen/components/cronet/android/http_cache_type_java.srcjar\", \"gen/components/cronet/android/load_states_list.srcjar\", \"gen/components/cronet/android/rtt_throughput_values_java.srcjar\", \"gen/net/effective_connection_type_java.srcjar\"]" ],
+      "args": [ "--type=java_library", "--depfile", "gen/components/cronet/android/cronet_impl_common_base_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/components/cronet/android/cronet_api_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/components/cronet/android/cronet_stats_log_java.build_config.json\", \"gen/net/android/net_thread_stats_uid_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "--gn-target", "//components/cronet/android:cronet_impl_common_base_java", "--device-jar-path", "obj/components/cronet/android/cronet_impl_common_base_java.processed.jar", "--host-jar-path", "lib.java/components/cronet/android/cronet_impl_common_base_java.jar", "--unprocessed-jar-path", "obj/components/cronet/android/cronet_impl_common_base_java.javac.jar", "--interface-jar-path", "obj/components/cronet/android/cronet_impl_common_base_java.turbine.jar", "--dex-path", "obj/components/cronet/android/cronet_impl_common_base_java.dex.jar", "--supports-android", "--requires-android", "--target-sources-file", "gen/components/cronet/android/cronet_impl_common_base_java.sources", "--bundled-srcjars=[\"gen/components/cronet/android/http_cache_type_java.srcjar\", \"gen/components/cronet/android/load_states_list.srcjar\", \"gen/components/cronet/android/rtt_throughput_values_java.srcjar\", \"gen/net/effective_connection_type_java.srcjar\"]", "--proguard-configs=[\"../../components/cronet/android/cronet_impl_common_proguard.cfg\"]" ],
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java__build_config_crbug_908819.d",
-      "deps": [ "//components/cronet/android:cronet_api_java__build_config_crbug_908819", "//net/android:net_thread_stats_uid_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819" ],
-      "inputs": [ "//out/cronet/gen/components/cronet/android/cronet_api_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/net/android/net_thread_stats_uid_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
+      "deps": [ "//components/cronet/android:cronet_api_java__build_config_crbug_908819", "//components/cronet/android:cronet_stats_log_java__build_config_crbug_908819", "//net/android:net_thread_stats_uid_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819" ],
+      "inputs": [ "//out/cronet/gen/components/cronet/android/cronet_api_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_stats_log_java.build_config.json", "//out/cronet/gen/net/android/net_thread_stats_uid_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
       "metadata": {
 
       },
@@ -9100,8 +9082,8 @@
    "//components/cronet/android:cronet_impl_common_base_java__compile_java": {
       "args": [ "--depfile=gen/components/cronet/android/cronet_impl_common_base_java__compile_java.d", "--generated-dir=gen/components/cronet/android/cronet_impl_common_base_java/generated_java", "--jar-path=obj/components/cronet/android/cronet_impl_common_base_java.javac.jar", "--java-srcjars=[\"gen/components/cronet/android/http_cache_type_java.srcjar\", \"gen/components/cronet/android/load_states_list.srcjar\", \"gen/components/cronet/android/rtt_throughput_values_java.srcjar\", \"gen/net/effective_connection_type_java.srcjar\", \"gen/components/cronet/android/cronet_impl_common_base_java.generated.srcjar\"]", "--target-name", "//components/cronet/android:cronet_impl_common_base_java__compile_java", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_common_base_java.build_config.json:android:sdk_interface_jars)", "--header-jar", "obj/components/cronet/android/cronet_impl_common_base_java.turbine.jar", "--classpath=[\"obj/components/cronet/android/cronet_impl_common_base_java.turbine.jar\"]", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_common_base_java.build_config.json:deps_info:javac_full_interface_classpath)", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/components/cronet/android/cronet_impl_common_base_java.sources" ],
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java__compile_java.d",
-      "deps": [ "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__header", "//components/cronet/android:http_cache_type_java", "//components/cronet/android:implementation_api_version", "//components/cronet/android:load_states_list", "//components/cronet/android:rtt_throughput_values_java", "//net:effective_connection_type_java", "//net/android:net_thread_stats_uid_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header" ],
-      "inputs": [ "//components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLoggerFactory.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetManifest.java", "//components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java", "//components/cronet/android/java/src/org/chromium/net/impl/QuicExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/RefCountDelegate.java", "//components/cronet/android/java/src/org/chromium/net/impl/RequestFinishedInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java", "//components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java", "//out/cronet/gen/components/cronet/android/templates/org/chromium/net/impl/ImplVersion.java", "//out/cronet/gen/components/cronet/android/http_cache_type_java.srcjar", "//out/cronet/gen/components/cronet/android/load_states_list.srcjar", "//out/cronet/gen/components/cronet/android/rtt_throughput_values_java.srcjar", "//out/cronet/gen/net/effective_connection_type_java.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.generated.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.sources", "//out/cronet/obj/components/cronet/android/cronet_impl_common_base_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "deps": [ "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__header", "//components/cronet/android:cronet_stats_log_java__header", "//components/cronet/android:http_cache_type_java", "//components/cronet/android:implementation_api_version", "//components/cronet/android:load_states_list", "//components/cronet/android:rtt_throughput_values_java", "//net:effective_connection_type_java", "//net/android:net_thread_stats_uid_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header" ],
+      "inputs": [ "//components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLoggerFactory.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetManifest.java", "//components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java", "//components/cronet/android/java/src/org/chromium/net/impl/QuicExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/RefCountDelegate.java", "//components/cronet/android/java/src/org/chromium/net/impl/RequestFinishedInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java", "//components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/CronetLoggerImpl.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/ExperimentalOptions.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/RateLimiter.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/SizeBuckets.java", "//out/cronet/gen/components/cronet/android/templates/org/chromium/net/impl/ImplVersion.java", "//out/cronet/gen/components/cronet/android/http_cache_type_java.srcjar", "//out/cronet/gen/components/cronet/android/load_states_list.srcjar", "//out/cronet/gen/components/cronet/android/rtt_throughput_values_java.srcjar", "//out/cronet/gen/net/effective_connection_type_java.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.generated.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.sources", "//out/cronet/obj/components/cronet/android/cronet_impl_common_base_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
       "metadata": {
 
       },
@@ -9116,7 +9098,7 @@
    "//components/cronet/android:cronet_impl_common_base_java__dex": {
       "args": [ "--depfile", "gen/components/cronet/android/cronet_impl_common_base_java__dex.d", "--output", "obj/components/cronet/android/cronet_impl_common_base_java.dex.jar", "--min-api=21", "--r8-jar-path", "../../third_party/r8/d8/lib/r8.jar", "--custom-d8-jar-path", "../../third_party/r8/custom_d8.jar", "--warnings-as-errors", "--incremental-dir", "obj/components/cronet/android/cronet_impl_common_base_java__dex", "--library", "--class-inputs=[\"obj/components/cronet/android/cronet_impl_common_base_java.processed.jar\"]", "--desugar", "--classpath", "obj/components/cronet/android/cronet_impl_common_base_java.javac.jar", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_common_base_java.build_config.json:deps_info:javac_full_interface_classpath)", "--desugar-dependencies", "gen/components/cronet/android/cronet_impl_common_base_java__dex.desugardeps", "--bootclasspath=@FileArg(gen/components/cronet/android/cronet_impl_common_base_java.build_config.json:android:sdk_jars)" ],
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java__dex.d",
-      "deps": [ "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__compile_java", "//components/cronet/android:cronet_impl_common_base_java__process_device", "//components/cronet/android:implementation_api_version", "//net/android:net_thread_stats_uid_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header" ],
+      "deps": [ "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__compile_java", "//components/cronet/android:cronet_impl_common_base_java__process_device", "//components/cronet/android:cronet_stats_log_java__header", "//components/cronet/android:implementation_api_version", "//net/android:net_thread_stats_uid_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header" ],
       "inputs": [ "//third_party/jdk/current/bin/java.chromium", "//third_party/r8/d8/lib/r8.jar", "//third_party/r8/custom_d8.jar", "//out/cronet/obj/components/cronet/android/cronet_impl_common_base_java.processed.jar", "//out/cronet/obj/components/cronet/android/cronet_impl_common_base_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/gyp/dex.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/md5_check.py" ],
       "metadata": {
 
@@ -9132,8 +9114,8 @@
    "//components/cronet/android:cronet_impl_common_base_java__header": {
       "args": [ "--depfile=gen/components/cronet/android/cronet_impl_common_base_java__header.d", "--generated-dir=gen/components/cronet/android/cronet_impl_common_base_java/generated_java", "--jar-path=obj/components/cronet/android/cronet_impl_common_base_java.turbine.jar", "--java-srcjars=[\"gen/components/cronet/android/http_cache_type_java.srcjar\", \"gen/components/cronet/android/load_states_list.srcjar\", \"gen/components/cronet/android/rtt_throughput_values_java.srcjar\", \"gen/net/effective_connection_type_java.srcjar\"]", "--target-name", "//components/cronet/android:cronet_impl_common_base_java__header", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_common_base_java.build_config.json:android:sdk_interface_jars)", "--classpath=@FileArg(gen/components/cronet/android/cronet_impl_common_base_java.build_config.json:javac:interface_classpath)", "--processorpath=@FileArg(gen/components/cronet/android/cronet_impl_common_base_java.build_config.json:javac:processor_classpath)", "--processors=@FileArg(gen/components/cronet/android/cronet_impl_common_base_java.build_config.json:javac:processor_classes)", "--turbine-jar-path", "../../third_party/turbine/turbine.jar", "--generated-jar-path", "gen/components/cronet/android/cronet_impl_common_base_java.generated.srcjar", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/components/cronet/android/cronet_impl_common_base_java.sources" ],
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java__header.d",
-      "deps": [ "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:http_cache_type_java", "//components/cronet/android:implementation_api_version", "//components/cronet/android:load_states_list", "//components/cronet/android:rtt_throughput_values_java", "//net:effective_connection_type_java", "//net/android:net_thread_stats_uid_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header" ],
-      "inputs": [ "//components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLoggerFactory.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetManifest.java", "//components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java", "//components/cronet/android/java/src/org/chromium/net/impl/QuicExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/RefCountDelegate.java", "//components/cronet/android/java/src/org/chromium/net/impl/RequestFinishedInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java", "//components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java", "//out/cronet/gen/components/cronet/android/templates/org/chromium/net/impl/ImplVersion.java", "//out/cronet/gen/components/cronet/android/http_cache_type_java.srcjar", "//out/cronet/gen/components/cronet/android/load_states_list.srcjar", "//out/cronet/gen/components/cronet/android/rtt_throughput_values_java.srcjar", "//out/cronet/gen/net/effective_connection_type_java.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "deps": [ "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_stats_log_java__header", "//components/cronet/android:http_cache_type_java", "//components/cronet/android:implementation_api_version", "//components/cronet/android:load_states_list", "//components/cronet/android:rtt_throughput_values_java", "//net:effective_connection_type_java", "//net/android:net_thread_stats_uid_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header" ],
+      "inputs": [ "//components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLoggerFactory.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetManifest.java", "//components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java", "//components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java", "//components/cronet/android/java/src/org/chromium/net/impl/QuicExceptionImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/RefCountDelegate.java", "//components/cronet/android/java/src/org/chromium/net/impl/RequestFinishedInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java", "//components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/CronetLoggerImpl.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/ExperimentalOptions.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/RateLimiter.java", "//components/cronet/android/java/src/org/chromium/net/telemetry/SizeBuckets.java", "//out/cronet/gen/components/cronet/android/templates/org/chromium/net/impl/ImplVersion.java", "//out/cronet/gen/components/cronet/android/http_cache_type_java.srcjar", "//out/cronet/gen/components/cronet/android/load_states_list.srcjar", "//out/cronet/gen/components/cronet/android/rtt_throughput_values_java.srcjar", "//out/cronet/gen/net/effective_connection_type_java.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
       "metadata": {
 
       },
@@ -9147,7 +9129,7 @@
    },
    "//components/cronet/android:cronet_impl_common_base_java__host": {
       "args": [ "--input", "obj/components/cronet/android/cronet_impl_common_base_java.javac.jar", "--output", "lib.java/components/cronet/android/cronet_impl_common_base_java.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//components/cronet/android:cronet_api_java__host", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__compile_java", "//components/cronet/android:implementation_api_version", "//net/android:net_thread_stats_uid_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host" ],
+      "deps": [ "//components/cronet/android:cronet_api_java__host", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__compile_java", "//components/cronet/android:cronet_stats_log_java__host", "//components/cronet/android:implementation_api_version", "//net/android:net_thread_stats_uid_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host" ],
       "inputs": [ "//out/cronet/obj/components/cronet/android/cronet_impl_common_base_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
       "metadata": {
 
@@ -9162,7 +9144,7 @@
    },
    "//components/cronet/android:cronet_impl_common_base_java__process_device": {
       "args": [ "--input", "obj/components/cronet/android/cronet_impl_common_base_java.javac.jar", "--output", "obj/components/cronet/android/cronet_impl_common_base_java.processed.jar", "--exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "--include-globs=[]" ],
-      "deps": [ "//components/cronet/android:cronet_api_java__host", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__compile_java", "//components/cronet/android:implementation_api_version", "//net/android:net_thread_stats_uid_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host" ],
+      "deps": [ "//components/cronet/android:cronet_api_java__host", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__compile_java", "//components/cronet/android:cronet_stats_log_java__host", "//components/cronet/android:implementation_api_version", "//net/android:net_thread_stats_uid_java__host", "//third_party/android_sdk:android_sdk_java", "//third_party/androidx:androidx_annotation_annotation_java__host" ],
       "inputs": [ "//out/cronet/obj/components/cronet/android/cronet_impl_common_base_java.javac.jar", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/filter_zip.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
       "metadata": {
 
@@ -9176,7 +9158,7 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_common_base_java__validate": {
-      "deps": [ "//components/cronet/android:cronet_api_java__validate", "//net/android:net_thread_stats_uid_java__validate", "//third_party/androidx:androidx_annotation_annotation_java__validate" ],
+      "deps": [ "//components/cronet/android:cronet_api_java__validate", "//components/cronet/android:cronet_stats_log_java__validate", "//net/android:net_thread_stats_uid_java__validate", "//third_party/androidx:androidx_annotation_annotation_java__validate" ],
       "metadata": {
 
       },
@@ -9191,6 +9173,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_common_base_java", "//components/cronet/android:cronet_impl_java_util_java", "//third_party/androidx:androidx_annotation_annotation_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/fake/java/org/chromium/net/test/FakeCronetController.java", "//components/cronet/android/fake/java/org/chromium/net/test/FakeCronetEngine.java", "//components/cronet/android/fake/java/org/chromium/net/test/FakeCronetProvider.java", "//components/cronet/android/fake/java/org/chromium/net/test/FakeRequestFinishedInfo.java", "//components/cronet/android/fake/java/org/chromium/net/test/FakeUrlRequest.java", "//components/cronet/android/fake/java/org/chromium/net/test/FakeUrlResponse.java", "//components/cronet/android/fake/java/org/chromium/net/test/ResponseMatcher.java", "//components/cronet/android/fake/java/org/chromium/net/test/UrlResponseMatcher.java" ],
          "target_type": [ "java_library" ]
       },
@@ -9321,6 +9304,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_common_base_java", "//third_party/androidx:androidx_annotation_annotation_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/java/src/org/chromium/net/impl/JavaUploadDataSinkBase.java", "//components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequestUtils.java" ],
          "target_type": [ "java_library" ]
       },
@@ -9451,6 +9435,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_common_base_java", "//build/android:build_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:protobuf_lite_runtime_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java", "//components/cronet/android:cronet_urlconnection_impl_java", "//components/cronet/android:base_feature_overrides_java_proto", "//components/cronet/android:flags_java_proto", "//components/cronet/android:request_context_config_java_proto", "//base:base_java", "//third_party/jni_zero:jni_zero_java", "//build/android:build_java", "//net/android:net_java", "//url:url_java", "//components/cronet/android:net_idempotency_java", "//components/cronet/android:net_request_priority_java", "//components/cronet/android:network_quality_observation_source_java", "//components/cronet/android:url_request_error_java", "//components/cronet/android:cronet_jni_headers" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/java/src/org/chromium/net/httpflags/BaseFeature.java", "//components/cronet/android/java/src/org/chromium/net/httpflags/HttpFlagsLoader.java", "//components/cronet/android/java/src/org/chromium/net/httpflags/ResolvedFlags.java", "//components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetMetrics.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java", "//components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderWithLibraryLoaderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NativeCronetProvider.java" ],
          "target_type": [ "java_library" ]
       },
@@ -9472,7 +9457,7 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_impl_native_base_java__build_config_crbug_908819": {
-      "args": [ "--type=java_library", "--depfile", "gen/components/cronet/android/cronet_impl_native_base_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/components/cronet/android/cronet_api_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_common_base_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json\", \"gen/third_party/android_deps/protobuf_lite_runtime_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/components/cronet/android/cronet_urlconnection_impl_java.build_config.json\", \"gen/components/cronet/android/base_feature_overrides_java_proto.build_config.json\", \"gen/components/cronet/android/flags_java_proto.build_config.json\", \"gen/components/cronet/android/request_context_config_java_proto.build_config.json\", \"gen/base/base_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/net/android/net_java.build_config.json\", \"gen/url/url_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_impl_native_base_java.build_config.json", "--gn-target", "//components/cronet/android:cronet_impl_native_base_java", "--device-jar-path", "obj/components/cronet/android/cronet_impl_native_base_java.processed.jar", "--host-jar-path", "lib.java/components/cronet/android/cronet_impl_native_base_java.jar", "--unprocessed-jar-path", "obj/components/cronet/android/cronet_impl_native_base_java.javac.jar", "--interface-jar-path", "obj/components/cronet/android/cronet_impl_native_base_java.turbine.jar", "--dex-path", "obj/components/cronet/android/cronet_impl_native_base_java.dex.jar", "--supports-android", "--requires-android", "--target-sources-file", "gen/components/cronet/android/cronet_impl_native_base_java.sources", "--bundled-srcjars=[\"gen/components/cronet/android/net_idempotency_java.srcjar\", \"gen/components/cronet/android/net_request_priority_java.srcjar\", \"gen/components/cronet/android/network_quality_observation_source_java.srcjar\", \"gen/components/cronet/android/url_request_error_java.srcjar\", \"gen/components/cronet/android/cronet_jni_headers.srcjar\"]" ],
+      "args": [ "--type=java_library", "--depfile", "gen/components/cronet/android/cronet_impl_native_base_java__build_config_crbug_908819.d", "--deps-configs=[\"gen/components/cronet/android/cronet_api_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_common_base_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json\", \"gen/third_party/android_deps/protobuf_lite_runtime_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/components/cronet/android/cronet_urlconnection_impl_java.build_config.json\", \"gen/components/cronet/android/base_feature_overrides_java_proto.build_config.json\", \"gen/components/cronet/android/flags_java_proto.build_config.json\", \"gen/components/cronet/android/request_context_config_java_proto.build_config.json\", \"gen/base/base_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/net/android/net_java.build_config.json\", \"gen/url/url_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_impl_native_base_java.build_config.json", "--gn-target", "//components/cronet/android:cronet_impl_native_base_java", "--device-jar-path", "obj/components/cronet/android/cronet_impl_native_base_java.processed.jar", "--host-jar-path", "lib.java/components/cronet/android/cronet_impl_native_base_java.jar", "--unprocessed-jar-path", "obj/components/cronet/android/cronet_impl_native_base_java.javac.jar", "--interface-jar-path", "obj/components/cronet/android/cronet_impl_native_base_java.turbine.jar", "--dex-path", "obj/components/cronet/android/cronet_impl_native_base_java.dex.jar", "--supports-android", "--requires-android", "--target-sources-file", "gen/components/cronet/android/cronet_impl_native_base_java.sources", "--bundled-srcjars=[\"gen/components/cronet/android/net_idempotency_java.srcjar\", \"gen/components/cronet/android/net_request_priority_java.srcjar\", \"gen/components/cronet/android/network_quality_observation_source_java.srcjar\", \"gen/components/cronet/android/url_request_error_java.srcjar\", \"gen/components/cronet/android/cronet_jni_headers.srcjar\"]", "--proguard-configs=[\"../../components/cronet/android/cronet_impl_native_proguard.cfg\"]" ],
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java__build_config_crbug_908819.d",
       "deps": [ "//base:base_java__build_config_crbug_908819", "//build/android:build_java__build_config_crbug_908819", "//components/cronet/android:base_feature_overrides_java_proto__build_config_crbug_908819", "//components/cronet/android:cronet_api_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_common_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_urlconnection_impl_java__build_config_crbug_908819", "//components/cronet/android:flags_java_proto__build_config_crbug_908819", "//components/cronet/android:request_context_config_java_proto__build_config_crbug_908819", "//net/android:net_java__build_config_crbug_908819", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__build_config_crbug_908819", "//third_party/android_deps:protobuf_lite_runtime_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819", "//third_party/jni_zero:jni_zero_java__build_config_crbug_908819", "//url:url_java__build_config_crbug_908819" ],
       "inputs": [ "//out/cronet/gen/components/cronet/android/cronet_api_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_impl_common_base_java.build_config.json", "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json", "//out/cronet/gen/third_party/android_deps/protobuf_lite_runtime_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/third_party/jni_zero/jni_zero_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_urlconnection_impl_java.build_config.json", "//out/cronet/gen/components/cronet/android/base_feature_overrides_java_proto.build_config.json", "//out/cronet/gen/components/cronet/android/flags_java_proto.build_config.json", "//out/cronet/gen/components/cronet/android/request_context_config_java_proto.build_config.json", "//out/cronet/gen/base/base_java.build_config.json", "//out/cronet/gen/third_party/jni_zero/jni_zero_java.build_config.json", "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/net/android/net_java.build_config.json", "//out/cronet/gen/url/url_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
@@ -9492,6 +9477,7 @@
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java__compile_java.d",
       "deps": [ "//base:base_java__header", "//build/android:build_java__header", "//components/cronet/android:base_feature_overrides_java_proto__header", "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_common_base_java__header", "//components/cronet/android:cronet_impl_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_native_base_java__header", "//components/cronet/android:cronet_jni_headers", "//components/cronet/android:cronet_urlconnection_impl_java__header", "//components/cronet/android:flags_java_proto__header", "//components/cronet/android:net_idempotency_java", "//components/cronet/android:net_request_priority_java", "//components/cronet/android:network_quality_observation_source_java", "//components/cronet/android:request_context_config_java_proto__header", "//components/cronet/android:url_request_error_java", "//net/android:net_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_deps:protobuf_lite_runtime_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header", "//url:url_java__header" ],
       "inputs": [ "//components/cronet/android/java/src/org/chromium/net/httpflags/BaseFeature.java", "//components/cronet/android/java/src/org/chromium/net/httpflags/HttpFlagsLoader.java", "//components/cronet/android/java/src/org/chromium/net/httpflags/ResolvedFlags.java", "//components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetMetrics.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java", "//components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderWithLibraryLoaderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NativeCronetProvider.java", "//out/cronet/gen/components/cronet/android/net_idempotency_java.srcjar", "//out/cronet/gen/components/cronet/android/net_request_priority_java.srcjar", "//out/cronet/gen/components/cronet/android/network_quality_observation_source_java.srcjar", "//out/cronet/gen/components/cronet/android/url_request_error_java.srcjar", "//out/cronet/gen/components/cronet/android/cronet_jni_headers.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java.generated.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java.sources", "//out/cronet/obj/components/cronet/android/cronet_impl_native_base_java.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -9524,6 +9510,7 @@
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java__header.d",
       "deps": [ "//base:base_java__header", "//build/android:build_java__header", "//components/cronet/android:base_feature_overrides_java_proto__header", "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_impl_common_base_java__header", "//components/cronet/android:cronet_impl_native_base_java__build_config_crbug_908819", "//components/cronet/android:cronet_jni_headers", "//components/cronet/android:cronet_urlconnection_impl_java__header", "//components/cronet/android:flags_java_proto__header", "//components/cronet/android:net_idempotency_java", "//components/cronet/android:net_request_priority_java", "//components/cronet/android:network_quality_observation_source_java", "//components/cronet/android:request_context_config_java_proto__header", "//components/cronet/android:url_request_error_java", "//net/android:net_java__header", "//third_party/android_deps:com_google_code_findbugs_jsr305_java__header", "//third_party/android_deps:protobuf_lite_runtime_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/androidx:androidx_annotation_annotation_java__header", "//third_party/jni_zero:jni_zero_java__header", "//url:url_java__header" ],
       "inputs": [ "//components/cronet/android/java/src/org/chromium/net/httpflags/BaseFeature.java", "//components/cronet/android/java/src/org/chromium/net/httpflags/HttpFlagsLoader.java", "//components/cronet/android/java/src/org/chromium/net/httpflags/ResolvedFlags.java", "//components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetMetrics.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java", "//components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderWithLibraryLoaderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/NativeCronetProvider.java", "//out/cronet/gen/components/cronet/android/net_idempotency_java.srcjar", "//out/cronet/gen/components/cronet/android/net_request_priority_java.srcjar", "//out/cronet/gen/components/cronet/android/network_quality_observation_source_java.srcjar", "//out/cronet/gen/components/cronet/android/url_request_error_java.srcjar", "//out/cronet/gen/components/cronet/android/cronet_jni_headers.srcjar", "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_impl_native_base_java.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -9581,6 +9568,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_common_base_java", "//components/cronet/android:cronet_impl_java_util_java", "//net/android:net_thread_stats_uid_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/androidx:androidx_annotation_annotation_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/java/src/org/chromium/net/impl/InputStreamChannel.java", "//components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngine.java", "//components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngineBuilderImpl.java", "//components/cronet/android/java/src/org/chromium/net/impl/JavaCronetProvider.java", "//components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java" ],
          "target_type": [ "java_library" ]
       },
@@ -9711,7 +9699,8 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_api_helpers_java", "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_impl_all_java", "//components/cronet/android:cronet_urlconnection_impl_java", "//third_party/android_deps:guava_android_java", "//third_party/android_deps:protobuf_lite_runtime_java", "//third_party/android_sdk:android_test_base_java", "//third_party/androidx:androidx_test_ext_junit_java", "//third_party/androidx:androidx_test_runner_java", "//third_party/google-truth:google_truth_java", "//third_party/hamcrest:hamcrest_core_java", "//third_party/junit:junit", "//third_party/mockito:mockito_java", "//components/cronet/android:cronet_common_javatests", "//components/cronet/android:cronet_test_apk_java", "//components/cronet/android:flags_java_proto", "//base:base_java", "//third_party/jni_zero:jni_zero_java", "//base:base_java_test_support", "//net/android:embedded_test_server_aidl_java", "//net/android:net_java", "//net/android:net_java_test_support", "//url:url_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//components/cronet/android:cronet_tests_jni_headers" ],
          "jar_path": [ "" ],
-         "source_files": [ "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/Criteria.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetEngineBuilderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetOnboardingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetTestRuleTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTranslationTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/FileUtils.java", "//components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/LogcatCapture.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MetricsTestUtil.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MockCertVerifierTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkChangesTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkErrorLoggingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestDrivenDataProvider.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityRttListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityThroughputListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/UrlResponseInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/ContentTypeParametersParserTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/UploadDataProvidersTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/BaseFeatureTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/HttpFlagsLoaderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/ResolvedFlagsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetManifestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetInputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/TestUtil.java" ],
+         "sdk_version": [ "current" ],
+         "source_files": [ "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/Criteria.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetEngineBuilderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetOnboardingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetTestRuleTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTranslationTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/FileUtils.java", "//components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/LogcatCapture.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MetricsTestUtil.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MockCertVerifierTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkChangesTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkErrorLoggingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestDrivenDataProvider.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityRttListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityThroughputListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/UrlResponseInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/ContentTypeParametersParserTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/UploadDataProvidersTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/BaseFeatureTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/HttpFlagsLoaderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/ResolvedFlagsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetManifestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/CronetLoggerImplTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/ExperimentalOptionsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/RateLimiterTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/SizeBucketsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetInputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/TestUtil.java" ],
          "target_type": [ "java_library" ]
       },
       "public": "*",
@@ -9751,7 +9740,8 @@
       "args": [ "--depfile=gen/components/cronet/android/cronet_javatests__compile_java.d", "--generated-dir=gen/components/cronet/android/cronet_javatests/generated_java", "--jar-path=obj/components/cronet/android/cronet_javatests.javac.jar", "--java-srcjars=[\"gen/components/cronet/android/cronet_tests_jni_headers.srcjar\", \"gen/components/cronet/android/cronet_javatests.generated.srcjar\"]", "--target-name", "//components/cronet/android:cronet_javatests__compile_java", "--classpath=@FileArg(gen/components/cronet/android/cronet_javatests.build_config.json:android:sdk_interface_jars)", "--header-jar", "obj/components/cronet/android/cronet_javatests.turbine.jar", "--classpath=[\"obj/components/cronet/android/cronet_javatests.turbine.jar\"]", "--classpath=@FileArg(gen/components/cronet/android/cronet_javatests.build_config.json:deps_info:javac_full_interface_classpath)", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/components/cronet/android/cronet_javatests.sources" ],
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_javatests__compile_java.d",
       "deps": [ "//base:base_java__header", "//base:base_java_test_support__header", "//components/cronet/android:cronet_api_helpers_java__header", "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_common_javatests__header", "//components/cronet/android:cronet_impl_all_java__header", "//components/cronet/android:cronet_javatests__build_config_crbug_908819", "//components/cronet/android:cronet_javatests__header", "//components/cronet/android:cronet_test_apk_java__header", "//components/cronet/android:cronet_tests_jni_headers", "//components/cronet/android:cronet_urlconnection_impl_java__header", "//components/cronet/android:flags_java_proto__header", "//net/android:embedded_test_server_aidl_java__header", "//net/android:net_java__header", "//net/android:net_java_test_support__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_deps:protobuf_lite_runtime_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/android_sdk:android_test_base_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_test_ext_junit_java__header", "//third_party/androidx:androidx_test_runner_java__header", "//third_party/google-truth:google_truth_java__header", "//third_party/hamcrest:hamcrest_core_java__header", "//third_party/jni_zero:jni_zero_java__header", "//third_party/junit:junit__header", "//third_party/mockito:mockito_java__header", "//url:url_java__header" ],
-      "inputs": [ "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/Criteria.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetEngineBuilderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetOnboardingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetTestRuleTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTranslationTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/FileUtils.java", "//components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/LogcatCapture.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MetricsTestUtil.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MockCertVerifierTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkChangesTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkErrorLoggingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestDrivenDataProvider.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityRttListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityThroughputListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/UrlResponseInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/ContentTypeParametersParserTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/UploadDataProvidersTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/BaseFeatureTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/HttpFlagsLoaderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/ResolvedFlagsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetManifestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetInputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/TestUtil.java", "//out/cronet/gen/components/cronet/android/cronet_tests_jni_headers.srcjar", "//out/cronet/gen/components/cronet/android/cronet_javatests.generated.srcjar", "//out/cronet/gen/components/cronet/android/cronet_javatests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_javatests.sources", "//out/cronet/obj/components/cronet/android/cronet_javatests.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "inputs": [ "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/Criteria.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetEngineBuilderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetOnboardingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetTestRuleTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTranslationTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/FileUtils.java", "//components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/LogcatCapture.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MetricsTestUtil.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MockCertVerifierTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkChangesTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkErrorLoggingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestDrivenDataProvider.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityRttListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityThroughputListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/UrlResponseInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/ContentTypeParametersParserTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/UploadDataProvidersTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/BaseFeatureTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/HttpFlagsLoaderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/ResolvedFlagsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetManifestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/CronetLoggerImplTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/ExperimentalOptionsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/RateLimiterTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/SizeBucketsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetInputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/TestUtil.java", "//out/cronet/gen/components/cronet/android/cronet_tests_jni_headers.srcjar", "//out/cronet/gen/components/cronet/android/cronet_javatests.generated.srcjar", "//out/cronet/gen/components/cronet/android/cronet_javatests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_javatests.sources", "//out/cronet/obj/components/cronet/android/cronet_javatests.turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -9783,7 +9773,8 @@
       "args": [ "--depfile=gen/components/cronet/android/cronet_javatests__header.d", "--generated-dir=gen/components/cronet/android/cronet_javatests/generated_java", "--jar-path=obj/components/cronet/android/cronet_javatests.turbine.jar", "--java-srcjars=[\"gen/components/cronet/android/cronet_tests_jni_headers.srcjar\"]", "--target-name", "//components/cronet/android:cronet_javatests__header", "--classpath=@FileArg(gen/components/cronet/android/cronet_javatests.build_config.json:android:sdk_interface_jars)", "--classpath=@FileArg(gen/components/cronet/android/cronet_javatests.build_config.json:javac:interface_classpath)", "--processorpath=@FileArg(gen/components/cronet/android/cronet_javatests.build_config.json:javac:processor_classpath)", "--processors=@FileArg(gen/components/cronet/android/cronet_javatests.build_config.json:javac:processor_classes)", "--turbine-jar-path", "../../third_party/turbine/turbine.jar", "--generated-jar-path", "gen/components/cronet/android/cronet_javatests.generated.srcjar", "--chromium-code=1", "--warnings-as-errors", "--jar-info-exclude-globs=[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/*GEN_JNI.class\"]", "@gen/components/cronet/android/cronet_javatests.sources" ],
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_javatests__header.d",
       "deps": [ "//base:base_java__header", "//base:base_java_test_support__header", "//components/cronet/android:cronet_api_helpers_java__header", "//components/cronet/android:cronet_api_java__header", "//components/cronet/android:cronet_common_javatests__header", "//components/cronet/android:cronet_impl_all_java__header", "//components/cronet/android:cronet_javatests__build_config_crbug_908819", "//components/cronet/android:cronet_test_apk_java__header", "//components/cronet/android:cronet_tests_jni_headers", "//components/cronet/android:cronet_urlconnection_impl_java__header", "//components/cronet/android:flags_java_proto__header", "//net/android:embedded_test_server_aidl_java__header", "//net/android:net_java__header", "//net/android:net_java_test_support__header", "//third_party/android_deps:guava_android_java__header", "//third_party/android_deps:protobuf_lite_runtime_java__header", "//third_party/android_sdk:android_sdk_java__header", "//third_party/android_sdk:android_test_base_java__header", "//third_party/androidx:androidx_annotation_annotation_experimental_java__header", "//third_party/androidx:androidx_test_ext_junit_java__header", "//third_party/androidx:androidx_test_runner_java__header", "//third_party/google-truth:google_truth_java__header", "//third_party/hamcrest:hamcrest_core_java__header", "//third_party/jni_zero:jni_zero_java__header", "//third_party/junit:junit__header", "//third_party/mockito:mockito_java__header", "//url:url_java__header" ],
-      "inputs": [ "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/Criteria.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetEngineBuilderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetOnboardingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetTestRuleTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTranslationTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/FileUtils.java", "//components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/LogcatCapture.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MetricsTestUtil.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MockCertVerifierTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkChangesTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkErrorLoggingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestDrivenDataProvider.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityRttListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityThroughputListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/UrlResponseInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/ContentTypeParametersParserTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/UploadDataProvidersTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/BaseFeatureTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/HttpFlagsLoaderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/ResolvedFlagsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetManifestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetInputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/TestUtil.java", "//out/cronet/gen/components/cronet/android/cronet_tests_jni_headers.srcjar", "//out/cronet/gen/components/cronet/android/cronet_javatests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_javatests.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "inputs": [ "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/Criteria.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetEngineBuilderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetOnboardingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetTestRuleTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTranslationTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/FileUtils.java", "//components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/LogcatCapture.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MetricsTestUtil.java", "//components/cronet/android/test/javatests/src/org/chromium/net/MockCertVerifierTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkChangesTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/NetworkErrorLoggingTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestDrivenDataProvider.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityRttListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/TestNetworkQualityThroughputListener.java", "//components/cronet/android/test/javatests/src/org/chromium/net/UrlResponseInfoTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/ContentTypeParametersParserTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/UploadDataProvidersTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/BaseFeatureTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/HttpFlagsLoaderTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/httpflags/ResolvedFlagsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetManifestTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/CronetLoggerImplTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/ExperimentalOptionsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/RateLimiterTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/telemetry/SizeBucketsTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetInputStreamTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java", "//components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/TestUtil.java", "//out/cronet/gen/components/cronet/android/cronet_tests_jni_headers.srcjar", "//out/cronet/gen/components/cronet/android/cronet_javatests.build_config.json", "//third_party/jdk/current/bin/java.chromium", "//out/cronet/gen/components/cronet/android/cronet_javatests.sources", "//third_party/turbine/turbine.jar", "//third_party/catapult/devil/devil/__init__.py", "//third_party/catapult/devil/devil/android/__init__.py", "//third_party/catapult/devil/devil/android/constants/__init__.py", "//third_party/catapult/devil/devil/android/constants/chrome.py", "//third_party/catapult/devil/devil/android/sdk/__init__.py", "//third_party/catapult/devil/devil/android/sdk/keyevent.py", "//third_party/catapult/devil/devil/android/sdk/version_codes.py", "//third_party/catapult/devil/devil/constants/__init__.py", "//third_party/catapult/devil/devil/constants/exit_codes.py", "//third_party/colorama/src/colorama/__init__.py", "//third_party/colorama/src/colorama/ansi.py", "//third_party/colorama/src/colorama/ansitowin32.py", "//third_party/colorama/src/colorama/initialise.py", "//third_party/colorama/src/colorama/win32.py", "//third_party/colorama/src/colorama/winterm.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/print_python_deps.py", "//build/zip_helpers.py", "//build/android/list_java_targets.py", "//build/android/pylib/__init__.py", "//build/android/pylib/constants/__init__.py", "//build/android/gyp/compile_java.py", "//build/android/gyp/javac_output_processor.py", "//build/android/gyp/turbine.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/dep_utils.py", "//build/android/gyp/util/jar_info_utils.py", "//build/android/gyp/util/jar_utils.py", "//build/android/gyp/util/md5_check.py", "//build/android/gyp/util/server_utils.py" ],
+      "libs": [ "log", "android_support" ],
       "metadata": {
 
       },
@@ -9837,6 +9828,19 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_jni_headers": {
+      "deps": [ "//components/cronet/android:cronet_jni_headers__action", "//third_party/jni_zero:jni_zero_utils" ],
+      "libs": [ "log", "android_support" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
+      "testonly": false,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//components/cronet/android:cronet_jni_headers__action": {
       "args": [ "from-source", "--output-dir", "gen/jni_headers/components/cronet/android/cronet_jni_headers", "--extra-include", "../../../../../../../../third_party/jni_zero/jni_zero_helper.h", "--srcjar-path", "gen/components/cronet/android/cronet_jni_headers.srcjar", "--use-proxy-hash", "--output-name", "CronetBidirectionalStream_jni.h", "--output-name", "CronetLibraryLoader_jni.h", "--output-name", "CronetUploadDataStream_jni.h", "--output-name", "CronetUrlRequest_jni.h", "--output-name", "CronetUrlRequestContext_jni.h", "--input-file=../../components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", "--input-file=../../components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", "--input-file=../../components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java", "--input-file=../../components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java", "--input-file=../../components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java" ],
       "deps": [ "//base:debugging_buildflags", "//base:logging_buildflags", "//build:chromeos_buildflags" ],
       "inputs": [ "//components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java", "//components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java", "//third_party/jni_zero/codegen/placeholder_gen_jni_java.py", "//third_party/jni_zero/codegen/proxy_impl_java.py", "//third_party/jni_zero/common.py", "//third_party/jni_zero/java_lang_classes.py", "//third_party/jni_zero/java_types.py", "//third_party/jni_zero/jni_generator.py", "//third_party/jni_zero/jni_registration_generator.py", "//third_party/jni_zero/jni_zero.py", "//third_party/jni_zero/parse.py", "//third_party/jni_zero/proxy.py" ],
@@ -9846,7 +9850,7 @@
       },
       "outputs": [ "//out/cronet/gen/components/cronet/android/cronet_jni_headers.srcjar", "//out/cronet/gen/jni_headers/components/cronet/android/cronet_jni_headers/CronetBidirectionalStream_jni.h", "//out/cronet/gen/jni_headers/components/cronet/android/cronet_jni_headers/CronetLibraryLoader_jni.h", "//out/cronet/gen/jni_headers/components/cronet/android/cronet_jni_headers/CronetUploadDataStream_jni.h", "//out/cronet/gen/jni_headers/components/cronet/android/cronet_jni_headers/CronetUrlRequest_jni.h", "//out/cronet/gen/jni_headers/components/cronet/android/cronet_jni_headers/CronetUrlRequestContext_jni.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:use_chromium_base_define", "//third_party/jni_zero:jni_include_dir" ],
       "script": "//third_party/jni_zero/jni_zero.py",
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -9863,7 +9867,7 @@
       },
       "outputs": [ "//out/cronet/gen/components/cronet/android/cronet_jni_registration.srcjar", "//out/cronet/gen/jni_headers/components/cronet/android/cronet_jni_registration_generated.h" ],
       "public": "*",
-      "public_configs": [ "//third_party/jni_zero:jni_include_dir" ],
+      "public_configs": [ "//third_party/jni_zero:jni_include_dir", "//third_party/jni_zero:use_chromium_base_define" ],
       "script": "//third_party/jni_zero/jni_zero.py",
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
@@ -9891,6 +9895,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_jni_registration" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [  ],
          "target_type": [ "java_library" ]
       },
@@ -10016,9 +10021,21 @@
       "type": "group",
       "visibility": [ "*" ]
    },
+   "//components/cronet/android:cronet_non_test_package": {
+      "all_dependent_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//net/third_party/quiche:quiche_config" ],
+      "deps": [ "//components/cronet/android:cronet_package_copy", "//components/cronet/android:cronet_package_copy_native_headers", "//components/cronet/android:cronet_package_copy_native_lib", "//components/cronet/android:cronet_package_copy_native_lib_unstripped", "//components/cronet/android:cronet_package_copy_resources", "//components/cronet/android:enforce_no_neon", "//components/cronet/android:jar_cronet_api_source", "//components/cronet/android:jar_cronet_impl_common_java_source", "//components/cronet/android:jar_cronet_impl_fake_java_source", "//components/cronet/android:jar_cronet_impl_native_java_source", "//components/cronet/android:jar_cronet_impl_platform_java_source", "//components/cronet/android:jar_cronet_sample_source", "//components/cronet/android:jar_httpengine_native_provider_java_source", "//components/cronet/android:repackage_api", "//components/cronet/android:repackage_common", "//components/cronet/android:repackage_fake", "//components/cronet/android:repackage_httpengine_native_provider", "//components/cronet/android:repackage_native", "//components/cronet/android:repackage_platform" ],
+      "metadata": {
+
+      },
+      "public": "*",
+      "testonly": false,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
    "//components/cronet/android:cronet_package_android": {
       "all_dependent_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//net/third_party/quiche:quiche_config", "//third_party/google_benchmark:benchmark_config" ],
-      "deps": [ "//components/cronet/android:api_static_checks", "//components/cronet/android:cronet_package_copy", "//components/cronet/android:cronet_package_copy_native_headers", "//components/cronet/android:cronet_package_copy_native_lib", "//components/cronet/android:cronet_package_copy_native_lib_unstripped", "//components/cronet/android:cronet_package_copy_resources", "//components/cronet/android:cronet_sizes", "//components/cronet/android:cronet_test_package", "//components/cronet/android:dependencies_checks", "//components/cronet/android:enforce_no_neon", "//components/cronet/android:generate_javadoc", "//components/cronet/android:generate_licenses", "//components/cronet/android:jar_cronet_api_source", "//components/cronet/android:jar_cronet_impl_common_java_source", "//components/cronet/android:jar_cronet_impl_fake_java_source", "//components/cronet/android:jar_cronet_impl_native_java_source", "//components/cronet/android:jar_cronet_impl_platform_java_source", "//components/cronet/android:jar_cronet_sample_source", "//components/cronet/android:repackage_api", "//components/cronet/android:repackage_common", "//components/cronet/android:repackage_fake", "//components/cronet/android:repackage_native", "//components/cronet/android:repackage_platform" ],
+      "deps": [ "//components/cronet/android:cronet_combined_proguard_flags_golden_test", "//components/cronet/android:cronet_non_test_package", "//components/cronet/android:cronet_test_package", "//components/cronet/android:dependencies_checks", "//components/cronet/android:generate_javadoc", "//components/cronet/android:generate_licenses" ],
       "metadata": {
 
       },
@@ -10029,14 +10046,14 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_package_copy": {
-      "deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_combine_proguard_flags", "//components/cronet/android:cronet_impl_common_base_java", "//components/cronet/android:cronet_impl_fake_base_java", "//components/cronet/android:cronet_impl_platform_base_java" ],
+      "deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_combine_proguard_flags", "//components/cronet/android:cronet_impl_common_base_java", "//components/cronet/android:cronet_impl_fake_base_java", "//components/cronet/android:cronet_impl_platform_base_java", "//components/cronet/android:httpengine_native_provider_base_java" ],
       "metadata": {
 
       },
       "output_patterns": [ "//out/cronet/cronet/{{source_file_part}}" ],
-      "outputs": [ "//out/cronet/cronet/cronet_impl_native_proguard.cfg", "//out/cronet/cronet/AUTHORS", "//out/cronet/cronet/VERSION", "//out/cronet/cronet/cronet_impl_common_proguard.cfg", "//out/cronet/cronet/cronet_impl_fake_proguard.cfg", "//out/cronet/cronet/cronet_impl_platform_proguard.cfg", "//out/cronet/cronet/implementation_api_version.txt", "//out/cronet/cronet/interface_api_version.txt" ],
+      "outputs": [ "//out/cronet/cronet/cronet_impl_native_proguard.cfg", "//out/cronet/cronet/AUTHORS", "//out/cronet/cronet/VERSION", "//out/cronet/cronet/cronet_impl_common_proguard.cfg", "//out/cronet/cronet/cronet_impl_fake_proguard.cfg", "//out/cronet/cronet/cronet_impl_platform_proguard.cfg", "//out/cronet/cronet/httpengine_native_provider_proguard.cfg", "//out/cronet/cronet/implementation_api_version.txt", "//out/cronet/cronet/interface_api_version.txt" ],
       "public": "*",
-      "sources": [ "//out/cronet/gen/components/cronet/android/cronet_impl_native_proguard.cfg", "//AUTHORS", "//chrome/VERSION", "//components/cronet/android/cronet_impl_common_proguard.cfg", "//components/cronet/android/cronet_impl_fake_proguard.cfg", "//components/cronet/android/cronet_impl_platform_proguard.cfg", "//components/cronet/android/implementation_api_version.txt", "//components/cronet/android/interface_api_version.txt" ],
+      "sources": [ "//out/cronet/gen/components/cronet/android/cronet_impl_native_proguard.cfg", "//AUTHORS", "//chrome/VERSION", "//components/cronet/android/cronet_impl_common_proguard.cfg", "//components/cronet/android/cronet_impl_fake_proguard.cfg", "//components/cronet/android/cronet_impl_platform_proguard.cfg", "//components/cronet/android/httpengine_native_provider_proguard.cfg", "//components/cronet/android/implementation_api_version.txt", "//components/cronet/android/interface_api_version.txt" ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "copy",
@@ -10062,9 +10079,9 @@
       "metadata": {
 
       },
-      "outputs": [ "//out/cronet/cronet/libs/armeabi-v7a/libcronet.121.0.6103.2.so" ],
+      "outputs": [ "//out/cronet/cronet/libs/armeabi-v7a/libcronet.121.0.6167.71.so" ],
       "public": "*",
-      "sources": [ "//out/cronet/libcronet.121.0.6103.2.so" ],
+      "sources": [ "//out/cronet/libcronet.121.0.6167.71.so" ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "copy",
@@ -10076,9 +10093,9 @@
       "metadata": {
 
       },
-      "outputs": [ "//out/cronet/cronet/symbols/armeabi-v7a/libcronet.121.0.6103.2.so" ],
+      "outputs": [ "//out/cronet/cronet/symbols/armeabi-v7a/libcronet.121.0.6167.71.so" ],
       "public": "*",
-      "sources": [ "//out/cronet/lib.unstripped/libcronet.121.0.6103.2.so" ],
+      "sources": [ "//out/cronet/lib.unstripped/libcronet.121.0.6167.71.so" ],
       "testonly": false,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "copy",
@@ -10147,9 +10164,9 @@
 
       },
       "output_patterns": [ "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/{{source_file_part}}" ],
-      "outputs": [ "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/expired_cert.pem", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/quic-chain.pem", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/quic-leaf-cert.key", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/quic-leaf-cert.key.pkcs8.pem", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/root_ca_cert.pem" ],
+      "outputs": [ "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/cronet-quic-chain.pem", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/cronet-quic-leaf-cert.key", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/cronet-quic-leaf-cert.key.pkcs8.pem", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/expired_cert.pem", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/quic-chain.pem", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/quic-leaf-cert.key", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/quic-leaf-cert.key.pkcs8.pem", "//out/cronet/cronet/test/assets/test_files/net/data/ssl/certificates/root_ca_cert.pem" ],
       "public": "*",
-      "sources": [ "//net/data/ssl/certificates/expired_cert.pem", "//net/data/ssl/certificates/quic-chain.pem", "//net/data/ssl/certificates/quic-leaf-cert.key", "//net/data/ssl/certificates/quic-leaf-cert.key.pkcs8.pem", "//net/data/ssl/certificates/root_ca_cert.pem" ],
+      "sources": [ "//net/data/ssl/certificates/cronet-quic-chain.pem", "//net/data/ssl/certificates/cronet-quic-leaf-cert.key", "//net/data/ssl/certificates/cronet-quic-leaf-cert.key.pkcs8.pem", "//net/data/ssl/certificates/expired_cert.pem", "//net/data/ssl/certificates/quic-chain.pem", "//net/data/ssl/certificates/quic-leaf-cert.key", "//net/data/ssl/certificates/quic-leaf-cert.key.pkcs8.pem", "//net/data/ssl/certificates/root_ca_cert.pem" ],
       "testonly": true,
       "toolchain": "//build/toolchain/android:android_clang_arm",
       "type": "copy",
@@ -10199,7 +10216,7 @@
       "visibility": [ "*" ]
    },
    "//components/cronet/android:cronet_perf_test_apk__build_config_crbug_908819": {
-      "args": [ "--type=android_apk", "--depfile", "gen/components/cronet/android/cronet_perf_test_apk__build_config_crbug_908819.d", "--deps-configs=[\"gen/components/cronet/android/cronet_api_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_all_java.build_config.json\", \"gen/components/cronet/android/cronet_javatests.build_config.json\", \"gen/components/cronet/android/cronet_test_apk_java.build_config.json\", \"gen/base/base_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_sdk/android_test_mock_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/third_party/junit/junit.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_perf_test_apk.build_config.json", "--gn-target", "//components/cronet/android:cronet_perf_test_apk__java", "--device-jar-path", "obj/components/cronet/android/cronet_perf_test_apk.processed.jar", "--unprocessed-jar-path", "obj/components/cronet/android/cronet_perf_test_apk.processed.jar", "--interface-jar-path", "obj/components/cronet/android/cronet_perf_test_apk.turbine.jar", "--dex-path", "obj/components/cronet/android/cronet_perf_test_apk.dex.jar", "--final-dex-path", "obj/components/cronet/android/cronet_perf_test_apk/cronet_perf_test_apk.r8dex.jar", "--supports-android", "--requires-android", "--merged-android-manifest", "gen/components/cronet/android/cronet_perf_test_apk/AndroidManifest.merged.xml", "--android-manifest", "../../components/cronet/android/test/javaperftests/AndroidManifest.xml", "--r-text-path=gen/components/cronet/android/cronet_perf_test_apk__compile_resources_R.txt", "--shared-libraries-runtime-deps", "gen/components/cronet/android/cronet_perf_test_apk.native_libs", "--loadable-modules=[]", "--apk-path=apks/CronetPerfTest.apk", "--target-sources-file", "gen/components/cronet/android/cronet_perf_test_apk.sources", "--bundled-srcjars=[\"gen/components/cronet/android/cronet_jni_registration.srcjar\", \"gen/components/cronet/android/cronet_tests_jni_registration.srcjar\", \"gen/components/cronet/android/cronet_perf_test_apk__compile_resources.srcjar\", \"gen/components/cronet/android/cronet_perf_test_apk__native_libraries.srcjar\", \"gen/components/cronet/android/cronet_perf_test_apk__build_config_srcjar.srcjar\"]", "--proguard-enabled", "--proguard-mapping-path=apks/CronetPerfTest.apk.mapping", "--proguard-configs=[\"obj/components/cronet/android/cronet_perf_test_apk/cronet_perf_test_apk.resources.proguard.txt\", \"gen/components/cronet/android/cronet_impl_native_proguard.cfg\", \"../../components/cronet/android/cronet_impl_common_proguard.cfg\", \"../../components/cronet/android/test/proguard.cfg\", \"../../testing/android/proguard_for_test.flags\", \"../../third_party/jni_zero/proguard_for_test.flags\"]", "--version-name", "Developer Build", "--version-code", "1" ],
+      "args": [ "--type=android_apk", "--depfile", "gen/components/cronet/android/cronet_perf_test_apk__build_config_crbug_908819.d", "--deps-configs=[\"gen/components/cronet/android/cronet_api_java.build_config.json\", \"gen/components/cronet/android/cronet_impl_all_java.build_config.json\", \"gen/components/cronet/android/cronet_javatests.build_config.json\", \"gen/components/cronet/android/cronet_test_apk_java.build_config.json\", \"gen/base/base_java.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_sdk/android_test_mock_java.build_config.json\", \"gen/third_party/jni_zero/jni_zero_java.build_config.json\", \"gen/third_party/junit/junit.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_perf_test_apk.build_config.json", "--gn-target", "//components/cronet/android:cronet_perf_test_apk__java", "--device-jar-path", "obj/components/cronet/android/cronet_perf_test_apk.processed.jar", "--unprocessed-jar-path", "obj/components/cronet/android/cronet_perf_test_apk.processed.jar", "--interface-jar-path", "obj/components/cronet/android/cronet_perf_test_apk.turbine.jar", "--dex-path", "obj/components/cronet/android/cronet_perf_test_apk.dex.jar", "--final-dex-path", "obj/components/cronet/android/cronet_perf_test_apk/cronet_perf_test_apk.r8dex.jar", "--supports-android", "--requires-android", "--merged-android-manifest", "gen/components/cronet/android/cronet_perf_test_apk/AndroidManifest.merged.xml", "--android-manifest", "../../components/cronet/android/test/javaperftests/AndroidManifest.xml", "--r-text-path=gen/components/cronet/android/cronet_perf_test_apk__compile_resources_R.txt", "--shared-libraries-runtime-deps", "gen/components/cronet/android/cronet_perf_test_apk.native_libs", "--loadable-modules=[]", "--apk-path=apks/CronetPerfTest.apk", "--target-sources-file", "gen/components/cronet/android/cronet_perf_test_apk.sources", "--bundled-srcjars=[\"gen/components/cronet/android/cronet_jni_registration.srcjar\", \"gen/components/cronet/android/cronet_tests_jni_registration.srcjar\", \"gen/components/cronet/android/cronet_perf_test_apk__compile_resources.srcjar\", \"gen/components/cronet/android/cronet_perf_test_apk__native_libraries.srcjar\", \"gen/components/cronet/android/cronet_perf_test_apk__build_config_srcjar.srcjar\"]", "--proguard-enabled", "--proguard-mapping-path=apks/CronetPerfTest.apk.mapping", "--proguard-configs=[\"obj/components/cronet/android/cronet_perf_test_apk/cronet_perf_test_apk.resources.proguard.txt\", \"gen/components/cronet/android/cronet_impl_native_proguard.cfg\", \"../../components/cronet/android/cronet_impl_common_proguard.cfg\", \"../../components/cronet/android/httpengine_native_provider_proguard.cfg\", \"../../components/cronet/android/test/proguard.cfg\", \"../../testing/android/proguard_for_test.flags\", \"../../third_party/jni_zero/proguard_for_test.flags\"]", "--version-name", "Developer Build", "--version-code", "1" ],
       "depfile": "//out/cronet/gen/components/cronet/android/cronet_perf_test_apk__build_config_crbug_908819.d",
       "deps": [ "//base:base_java__build_config_crbug_908819", "//build/android:build_java__build_config_crbug_908819", "//components/cronet/android:cronet_api_java__build_config_crbug_908819", "//components/cronet/android:cronet_impl_all_java__build_config_crbug_908819", "//components/cronet/android:cronet_javatests__build_config_crbug_908819", "//components/cronet/android:cronet_test_apk_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/android_sdk:android_test_mock_java__build_config_crbug_908819", "//third_party/jni_zero:jni_zero_java__build_config_crbug_908819", "//third_party/junit:junit__build_config_crbug_908819" ],
       "inputs": [ "//out/cronet/gen/components/cronet/android/cronet_api_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_impl_all_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_javatests.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_test_apk_java.build_config.json", "//out/cronet/gen/base/base_java.build_config.json", "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_test_mock_java.build_config.json", "//out/cronet/gen/third_party/jni_zero/jni_zero_java.build_config.json", "//out/cronet/gen/third_party/junit/junit.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//components/cronet/android/test/javaperftests/AndroidManifest.xml", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
@@ -10326,6 +10343,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_combine_proguard_flags", "//components/cronet/android:cronet_impl_all_java", "//components/cronet/android:cronet_javatests", "//components/cronet/android:cronet_test_apk_java", "//base:base_java", "//build/android:build_java", "//third_party/android_sdk:android_test_mock_java", "//third_party/jni_zero:jni_zero_java", "//third_party/junit:junit", "//components/cronet/android:cronet_jni_registration", "//components/cronet/android:cronet_tests_jni_registration", "//components/cronet/android:cronet_perf_test_apk__compile_resources", "//components/cronet/android:cronet_perf_test_apk__native_libraries", "//components/cronet/android:cronet_perf_test_apk__build_config_srcjar" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java" ],
          "target_type": [ "android_apk" ]
       },
@@ -10605,6 +10623,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_combine_proguard_flags", "//components/cronet/android:cronet_sample_apk_java", "//components/cronet/android:cronet_sample_apk_resources", "//third_party/android_deps:protobuf_lite_runtime_java", "//components/cronet/android:cronet_sample_apk__compile_resources", "//components/cronet/android:cronet_sample_apk__native_libraries" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [  ],
          "target_type": [ "android_apk" ]
       },
@@ -10749,6 +10768,7 @@
       "metadata": {
          "all_deps": [ "//components/cronet/android:cronet_sample_apk_resources", "//components/cronet/android:package_api_java", "//components/cronet/android:package_impl_native_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_appcompat_appcompat_java", "//third_party/androidx:androidx_fragment_fragment_java", "//third_party/androidx:androidx_lifecycle_lifecycle_viewmodel_java", "//third_party/androidx:androidx_preference_preference_java", "//third_party/androidx:androidx_recyclerview_recyclerview_java" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/sample/src/org/chromium/cronet_sample_apk/Action.java", "//components/cronet/android/sample/src/org/chromium/cronet_sample_apk/ActionData.java", "//components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java", "//components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java", "//components/cronet/android/sample/src/org/chromium/cronet_sample_apk/MainFragment.java", "//components/cronet/android/sample/src/org/chromium/cronet_sample_apk/Options.java", "//components/cronet/android/sample/src/org/chromium/cronet_sample_apk/OptionsFragment.java", "//components/cronet/android/sample/src/org/chromium/cronet_sample_apk/OptionsRecyclerViewAdapter.java", "//components/cronet/android/sample/src/org/chromium/cronet_sample_apk/SampleActivityViewModel.java" ],
          "target_type": [ "java_library" ]
       },
@@ -11088,6 +11108,7 @@
       "metadata": {
          "all_deps": [ "//testing/android/broker:broker_java", "//components/cronet/android:cronet_sample_apk_java", "//components/cronet/android:package_impl_common_java", "//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java", "//third_party/android_deps:espresso_java", "//third_party/androidx:androidx_test_monitor_java", "//third_party/androidx:androidx_test_rules_java", "//third_party/androidx:androidx_test_runner_java", "//third_party/google-truth:google_truth_java", "//third_party/junit:junit", "//components/cronet/android:cronet_sample_test_apk__test_apk__compile_resources" ],
          "jar_path": [ "" ],
+         "sdk_version": [ "current" ],
          "source_files": [ "//components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java" ],
          "target_type": [ "android_apk" ]
       },
@@ -11232,6 +11253,330 @@
       "type": "action",
       "visibility": [ "*" ]
    },
+   "//components/cronet/android:cronet_smoketests_apk": {
+      "all_dependent_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//net/third_party/quiche:quiche_config", "//third_party/google_benchmark:benchmark_config" ],
+      "args": [ "--executable", "@WrappedPath(../../testing/test_env.py)", "--wrapper-script", "bin/run_cronet_smoketests_apk", "--output-directory", ".", "--script-language", "bash", "--", "@WrappedPath(../../build/android/test_runner.py)", "instrumentation", "--output-directory", "@WrappedPath(.)", "--wrapper-script-args", "--runtime-deps-path", "@WrappedPath(gen.runtime/components/cronet/android/cronet_smoketests_apk.runtime_deps)", "--test-apk", "@WrappedPath(@FileArg(gen/components/cronet/android/cronet_smoketests_apk__test_apk.build_config.json:deps_info:apk_path))", "--proguard-mapping-path", "@WrappedPath(apks/CronetSmokeTestInstrumentation.apk.mapping)", "--use-local-devil-tools" ],
+      "deps": [ "//base:base_java", "//base:base_java_test_support", "//build/android:build_java", "//build/android:test_runner_core_py", "//build/android:test_runner_device_support", "//components/cronet/android:cronet_api_java", "//components/cronet/android:cronet_smoketests_apk__apk_operations", "//components/cronet/android:cronet_smoketests_apk__test_apk", "//components/cronet/android:cronet_smoketests_apk__test_apk__build_config_crbug_908819", "//components/cronet/android:cronet_smoketests_apk__write_deps", "//components/cronet/android:cronet_test_apk_java", "//components/cronet/android:cronet_test_apk_resources", "//testing:test_scripts_shared", "//third_party/android_sdk:android_test_base_java", "//third_party/android_sdk:android_test_mock_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_test_core_java", "//third_party/androidx:androidx_test_ext_junit_java", "//third_party/androidx:androidx_test_runner_java", "//third_party/google-truth:google_truth_java", "//third_party/junit:junit", "//third_party/netty-tcnative:netty-tcnative-so", "//third_party/netty4:netty_all_java" ],
+      "metadata": {
+
+      },
+      "outputs": [ "//out/cronet/bin/run_cronet_smoketests_apk" ],
+      "public": "*",
+      "script": "//build/android/gyp/generate_android_wrapper.py",
+      "sources": [ "//build/android/gyp/util/build_utils.py", "//build/gn_helpers.py", "//build/util/generate_wrapper.py" ],
+      "testonly": true,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "action",
+      "visibility": [ "*" ]
+   },
+   "//components/cronet/android:cronet_smoketests_apk__apk_operations": {
+      "args": [ "--script-output-path", "bin/cronet_smoketests_apk", "--package-name", "@FileArg(gen/components/cronet/android/cronet_smoketests_apk__test_apk.build_config.json:deps_info:package_name)", "--test-apk", "@FileArg(gen/components/cronet/android/cronet_smoketests_apk__test_apk.build_config.json:deps_info:apk_path)", "--proguard-mapping-path", "apks/CronetSmokeTestInstrumentation.apk.mapping" ],
+      "deps": [ "//components/cronet/android:cronet_smoketests_apk__test_apk__build_config_crbug_908819" ],
+      "inputs": [ "//build/gn_helpers.py", "//build/android/gyp/create_test_apk_wrapper_script.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
+      "metadata": {
+
+      },
+      "outputs": [ "//out/cronet/bin/cronet_smoketests_apk" ],
+      "public": "*",
+      "script": "//build/android/gyp/create_test_apk_wrapper_script.py",
+      "testonly": true,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "action",
+      "visibility": [ "*" ]
+   },
+   "//components/cronet/android:cronet_smoketests_apk__test_apk": {
+      "all_dependent_configs": [ "//base/allocator/partition_allocator/src/partition_alloc:wrap_malloc_symbols", "//net/third_party/quiche:quiche_config", "//third_party/google_benchmark:benchmark_config" ],
+      "deps": [ "//components/cronet/android:cronet", "//components/cronet/android:cronet_smoketests_apk__test_apk__build_config_crbug_908819", "//components/cronet/android:cronet_smoketests_apk__test_apk__copy_arsc", "//components/cronet/android:cronet_smoketests_apk__test_apk__copy_rtxt", "//components/cronet/android:cronet_smoketests_apk__test_apk__create", "//components/cronet/android:cronet_smoketests_apk__test_apk__java", "//components/cronet/android:cronet_smoketests_apk__test_apk__java__validate", "//components/cronet/android:cronet_smoketests_apk__test_apk__secondary_abi_shared_library_list", "//components/cronet/android:cronet_smoketests_apk__test_apk__shared_library_list", "//components/cronet/android:cronet_smoketests_apk__test_apk__size_info", "//components/cronet/android:cronet_tests" ],
+      "metadata": {
+         "install_artifacts": [ "//out/cronet/apks/CronetSmokeTestInstrumentation.apk" ],
+         "java_walk_keys": [ ":cronet_smoketests_apk__test_apk__java" ]
+      },
+      "public": "*",
+      "testonly": true,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "group",
+      "visibility": [ "*" ]
+   },
+   "//components/cronet/android:cronet_smoketests_apk__test_apk__build_config_crbug_908819": {
+      "args": [ "--type=android_apk", "--depfile", "gen/components/cronet/android/cronet_smoketests_apk__test_apk__build_config_crbug_908819.d", "--deps-configs=[\"gen/testing/android/broker/broker_java.build_config.json\", \"gen/components/cronet/android/cronet_api_java.build_config.json\", \"gen/components/cronet/android/cronet_test_apk_java.build_config.json\", \"gen/components/cronet/android/cronet_test_apk_resources.build_config.json\", \"gen/base/base_java.build_config.json\", \"gen/base/base_java_test_support.build_config.json\", \"gen/build/android/build_java.build_config.json\", \"gen/third_party/android_sdk/android_test_base_java.build_config.json\", \"gen/third_party/android_sdk/android_test_mock_java.build_config.json\", \"gen/third_party/google-truth/google_truth_java.build_config.json\", \"gen/third_party/junit/junit.build_config.json\", \"gen/third_party/netty4/netty_all_java.build_config.json\", \"gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json\", \"gen/third_party/androidx/androidx_test_core_java.build_config.json\", \"gen/third_party/androidx/androidx_test_ext_junit_java.build_config.json\", \"gen/third_party/androidx/androidx_test_runner_java.build_config.json\", \"gen/third_party/android_sdk/android_sdk_java.build_config.json\"]", "--public-deps-configs=[]", "--build-config", "gen/components/cronet/android/cronet_smoketests_apk__test_apk.build_config.json", "--gn-target", "//components/cronet/android:cronet_smoketests_apk__test_apk__java", "--device-jar-path", "obj/components/cronet/android/cronet_smoketests_apk__test_apk.processed.jar", "--unprocessed-jar-path", "obj/components/cronet/android/cronet_smoketests_apk__test_apk.processed.jar", "--interface-jar-path", "obj/components/cronet/android/cronet_smoketests_apk__test_apk.turbine.jar", "--dex-path", "obj/components/cronet/android/cronet_smoketests_apk__test_apk.dex.jar", "--final-dex-path", "obj/components/cronet/android/cronet_smoketests_apk__test_apk/cronet_smoketests_apk__test_apk.r8dex.jar", "--supports-android", "--requires-android", "--merged-android-manifest", "gen/components/cronet/android/cronet_smoketests_apk__test_apk/AndroidManifest.merged.xml", "--android-manifest", "../../components/cronet/android/test/javatests/AndroidManifest.xml", "--r-text-path=gen/components/cronet/android/cronet_smoketests_apk__test_apk__compile_resources_R.txt", "--shared-libraries-runtime-deps", "gen/components/cronet/android/cronet_smoketests_apk__test_apk.native_libs", "--loadable-modules=[\"libnetty-tcnative.so\"]", "--apk-path=apks/CronetSmokeTestInstrumentation.apk", "--target-sources-file", "gen/components/cronet/android/cronet_smoketests_apk__test_apk.sources", "--bundled-srcjars=[\"gen/components/cronet/android/cronet_jni_registration.srcjar\", \"gen/components/cronet/android/cronet_tests_jni_registration.srcjar\", \"gen/components/cronet/android/cronet_smoketests_apk__test_apk__compile_resources.srcjar\", \"gen/components/cronet/android/cronet_smoketests_apk__test_apk__native_libraries.srcjar\", \"gen/components/cronet/android/cronet_smoketests_apk__test_apk__build_config_srcjar.srcjar\"]", "--proguard-enabled", "--proguard-mapping-path=apks/CronetSmokeTestInstrumentation.apk.mapping", "--proguard-configs=[\"obj/components/cronet/android/cronet_smoketests_apk__test_apk/cronet_smoketests_apk__test_apk.resources.proguard.txt\", \"../../testing/android/proguard_for_test.flags\", \"../../third_party/jni_zero/proguard_for_test.flags\", \"../../components/cronet/android/test/proguard.cfg\"]", "--version-name", "Developer Build", "--version-code", "1" ],
+      "depfile": "//out/cronet/gen/components/cronet/android/cronet_smoketests_apk__test_apk__build_config_crbug_908819.d",
+      "deps": [ "//base:base_java__build_config_crbug_908819", "//base:base_java_test_support__build_config_crbug_908819", "//build/android:build_java__build_config_crbug_908819", "//components/cronet/android:cronet_api_java__build_config_crbug_908819", "//components/cronet/android:cronet_test_apk_java__build_config_crbug_908819", "//components/cronet/android:cronet_test_apk_resources__build_config_crbug_908819", "//testing/android/broker:broker_java__build_config_crbug_908819", "//third_party/android_sdk:android_sdk_java__build_config_crbug_908819", "//third_party/android_sdk:android_test_base_java__build_config_crbug_908819", "//third_party/android_sdk:android_test_mock_java__build_config_crbug_908819", "//third_party/androidx:androidx_annotation_annotation_java__build_config_crbug_908819", "//third_party/androidx:androidx_test_core_java__build_config_crbug_908819", "//third_party/androidx:androidx_test_ext_junit_java__build_config_crbug_908819", "//third_party/androidx:androidx_test_runner_java__build_config_crbug_908819", "//third_party/google-truth:google_truth_java__build_config_crbug_908819", "//third_party/junit:junit__build_config_crbug_908819", "//third_party/netty4:netty_all_java__build_config_crbug_908819" ],
+      "inputs": [ "//out/cronet/gen/testing/android/broker/broker_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_api_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_test_apk_java.build_config.json", "//out/cronet/gen/components/cronet/android/cronet_test_apk_resources.build_config.json", "//out/cronet/gen/base/base_java.build_config.json", "//out/cronet/gen/base/base_java_test_support.build_config.json", "//out/cronet/gen/build/android/build_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_test_base_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_test_mock_java.build_config.json", "//out/cronet/gen/third_party/google-truth/google_truth_java.build_config.json", "//out/cronet/gen/third_party/junit/junit.build_config.json", "//out/cronet/gen/third_party/netty4/netty_all_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_annotation_annotation_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_test_core_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_test_ext_junit_java.build_config.json", "//out/cronet/gen/third_party/androidx/androidx_test_runner_java.build_config.json", "//out/cronet/gen/third_party/android_sdk/android_sdk_java.build_config.json", "//components/cronet/android/test/javatests/AndroidManifest.xml", "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", "//third_party/jinja2/bccache.py", "//third_party/jinja2/compiler.py", "//third_party/jinja2/defaults.py", "//third_party/jinja2/environment.py", "//third_party/jinja2/exceptions.py", "//third_party/jinja2/filters.py", "//third_party/jinja2/idtracking.py", "//third_party/jinja2/lexer.py", "//third_party/jinja2/loaders.py", "//third_party/jinja2/nodes.py", "//third_party/jinja2/optimizer.py", "//third_party/jinja2/parser.py", "//third_party/jinja2/runtime.py", "//third_party/jinja2/tests.py", "//third_party/jinja2/utils.py", "//third_party/jinja2/visitor.py", "//third_party/markupsafe/__init__.py", "//third_party/markupsafe/_compat.py", "//third_party/markupsafe/_native.py", "//build/action_helpers.py", "//build/gn_helpers.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py", "//build/android/gyp/util/resource_utils.py", "//build/android/gyp/write_build_config.py" ],
+      "metadata": {
+
+      },
+      "outputs": [ "//out/cronet/gen/components/cronet/android/cronet_smoketests_apk__test_apk.build_config.json" ],
+      "public": "*",
+      "script": "//build/android/gyp/write_build_config.py",
+      "testonly": true,
+      "toolchain": "//build/toolchain/android:android_clang_arm",
+      "type": "action",
+      "visibility": [ "*" ]
+   },
+   "//components/cronet/android:cronet_smoketests_apk__test_apk__build_config_srcjar": {
+      "args": [ "--include-dirs=[\"../../\", \"gen\"]", "--output", "gen/components/cronet/android/cronet_smoketests_apk__test_apk__build_config_srcjar.srcjar", "--define", "USE_FINAL", "--define", "_IS_FOR_TEST", "../../build/android/java/templates/BuildConfig.template" ],
+      "deps": [ "//components/cronet/android:cronet_smoketests_apk__test_apk__build_config_crbug_908819" ],
+      "inputs": [ "//build/action_helpers.py", "//build/gn_helpers.py", "//build/zip_helpers.py", "//build/android/gyp/gcc_preprocess.py", "//build/android/gyp/util/__init__.py", "//build/android/gyp/util/build_utils.py" ],
+      "metadata": {
+
+      },
+      "outputs": [ "//out/cronet/