Revert "Sort action_modules items before iterating"

This reverts commit 7537662681f9eb38cf27489413d8c8a1526a0625.

Change-Id: I3850a7c6b0aeaf77a2bd524a2d74cf2423e095f4

3 files changed, 229 insertions, 229 deletions

diff --git a/Android.bp b/Android.bp
index 287ef2d8d..8e5dbcb06 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"]
 
@@ -1154,7 +1154,7 @@ cc_genrule {
 // GN: //base/allocator/partition_allocator/src/partition_alloc:debugging_buildflags
 cc_genrule {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1166,9 +1166,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1178,7 +1178,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1190,9 +1190,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1202,7 +1202,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1231,7 +1231,7 @@ cc_genrule {
 // GN: //base/allocator/partition_allocator/src/partition_alloc:debugging_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1243,7 +1243,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1255,7 +1255,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1267,7 +1267,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1279,9 +1279,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1291,9 +1291,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1321,9 +1321,9 @@ cc_genrule {
 // 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",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1333,9 +1333,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1345,9 +1345,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1357,9 +1357,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1369,7 +1369,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1399,9 +1399,9 @@ cc_genrule {
 // GN: //base/allocator/partition_allocator/src/partition_alloc:partition_alloc_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1411,7 +1411,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1423,9 +1423,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1435,7 +1435,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1447,7 +1447,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1459,7 +1459,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1773,7 +1773,7 @@ cc_genrule {
 // GN: //base:anchor_functions_buildflags
 cc_genrule {
     name: "cronet_aml_base_anchor_functions_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1785,7 +1785,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1797,9 +1797,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1809,7 +1809,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1821,9 +1821,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
+         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1847,7 +1847,7 @@ cc_genrule {
 // GN: //base:anchor_functions_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_anchor_functions_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1859,9 +1859,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
+         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1871,9 +1871,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1883,7 +1883,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1895,7 +1895,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1907,7 +1907,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -5839,7 +5839,7 @@ cc_library_static {
 cc_genrule {
     name: "cronet_aml_base_build_date",
     cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
-         "1705445157",
+         "1712072430",
     out: [
         "base/generated_build_date.h",
     ],
@@ -5855,7 +5855,7 @@ cc_genrule {
 cc_genrule {
     name: "cronet_aml_base_build_date__testing",
     cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
-         "1705445157",
+         "1712072430",
     host_supported: true,
     out: [
         "base/generated_build_date.h",
@@ -5965,9 +5965,9 @@ cc_genrule {
 // GN: //base:debugging_buildflags
 cc_genrule {
     name: "cronet_aml_base_debugging_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -5977,9 +5977,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -5989,9 +5989,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6001,9 +6001,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6013,7 +6013,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -6039,9 +6039,9 @@ cc_genrule {
 // GN: //base:debugging_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_debugging_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6051,7 +6051,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -6063,7 +6063,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -6075,9 +6075,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6087,9 +6087,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6099,9 +6099,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7168,9 +7168,9 @@ java_genrule {
 // GN: //base:profiler_buildflags
 cc_genrule {
     name: "cronet_aml_base_profiler_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"true\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7180,7 +7180,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7192,9 +7192,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"true\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7204,7 +7204,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7216,7 +7216,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7242,9 +7242,9 @@ cc_genrule {
 // GN: //base:profiler_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_profiler_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"true\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7254,7 +7254,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7266,7 +7266,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7278,9 +7278,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"true\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7290,7 +7290,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7302,7 +7302,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8498,7 +8498,7 @@ cc_genrule {
 // GN: //base:tracing_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_tracing_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8510,9 +8510,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
+         "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -8522,7 +8522,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8534,7 +8534,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8546,7 +8546,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8558,9 +8558,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -8989,7 +8989,7 @@ cc_genrule {
 // GN: //build/config/compiler:compiler_buildflags__testing
 cc_genrule {
     name: "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -9001,9 +9001,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
-         "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
+         "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"2\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -9013,7 +9013,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -9025,7 +9025,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -9037,7 +9037,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -9049,9 +9049,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"2\" SYMBOL_LEVEL=\"1\"' | " +
+         "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19531,7 +19531,7 @@ cc_genrule {
 // GN: //net:buildflags
 cc_genrule {
     name: "cronet_aml_net_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19543,9 +19543,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
+         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"false\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19555,7 +19555,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19567,9 +19567,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"false\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
+         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19579,7 +19579,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19605,7 +19605,7 @@ cc_genrule {
 // GN: //net:buildflags__testing
 cc_genrule {
     name: "cronet_aml_net_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19617,9 +19617,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
+         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"false\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19629,7 +19629,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19641,9 +19641,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"false\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
+         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19653,7 +19653,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
diff --git a/android/tools/gn2bp/Android.bp.swp b/android/tools/gn2bp/Android.bp.swp
index 287ef2d8d..8e5dbcb06 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"]
 
@@ -1154,7 +1154,7 @@ cc_genrule {
 // GN: //base/allocator/partition_allocator/src/partition_alloc:debugging_buildflags
 cc_genrule {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1166,9 +1166,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1178,7 +1178,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1190,9 +1190,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1202,7 +1202,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1231,7 +1231,7 @@ cc_genrule {
 // GN: //base/allocator/partition_allocator/src/partition_alloc:debugging_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_debugging_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1243,7 +1243,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1255,7 +1255,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1267,7 +1267,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1279,9 +1279,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1291,9 +1291,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"true\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug && echo '--flags PA_DCHECK_IS_ON=\"false\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"false\" PA_DCHECK_IS_CONFIGURABLE=\"false\" PA_CAN_UNWIND_WITH_FRAME_POINTERS=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1321,9 +1321,9 @@ cc_genrule {
 // 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",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1333,9 +1333,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1345,9 +1345,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1357,9 +1357,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1369,7 +1369,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1399,9 +1399,9 @@ cc_genrule {
 // GN: //base/allocator/partition_allocator/src/partition_alloc:partition_alloc_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_allocator_partition_allocator_src_partition_alloc_partition_alloc_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1411,7 +1411,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1423,9 +1423,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
+         "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1435,7 +1435,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"false\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1447,7 +1447,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1459,7 +1459,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/allocator/partition_allocator/src/partition_alloc && echo '--flags HAS_64_BIT_POINTERS=\"true\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"false\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_BACKUP_REF_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_FEATURE_FLAG=\"false\" ENABLE_DANGLING_RAW_PTR_PERF_EXPERIMENT=\"false\" ENABLE_POINTER_SUBTRACTION_CHECK=\"false\" ENABLE_POINTER_ARITHMETIC_TRAIT_CHECK=\"true\" BACKUP_REF_PTR_POISON_OOB_PTR=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_ASAN_UNOWNED_PTR=\"false\" USE_HOOKABLE_RAW_PTR=\"false\" ENABLE_GWP_ASAN_SUPPORT=\"false\" FORCIBLY_ENABLE_BACKUP_REF_PTR_IN_ALL_PROCESSES=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_POINTER_COMPRESSION=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" USE_FREELIST_POOL_OFFSETS=\"false\" USE_STARSCAN=\"false\" PCSCAN_STACK_SUPPORTED=\"true\" ENABLE_PKEYS=\"false\" ENABLE_THREAD_ISOLATION=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1773,7 +1773,7 @@ cc_genrule {
 // GN: //base:anchor_functions_buildflags
 cc_genrule {
     name: "cronet_aml_base_anchor_functions_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1785,7 +1785,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1797,9 +1797,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1809,7 +1809,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1821,9 +1821,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
+         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1847,7 +1847,7 @@ cc_genrule {
 // GN: //base:anchor_functions_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_anchor_functions_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1859,9 +1859,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
+         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1871,9 +1871,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -1883,7 +1883,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1895,7 +1895,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -1907,7 +1907,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/android/library_loader && echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -5839,7 +5839,7 @@ cc_library_static {
 cc_genrule {
     name: "cronet_aml_base_build_date",
     cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
-         "1705445157",
+         "1712072430",
     out: [
         "base/generated_build_date.h",
     ],
@@ -5855,7 +5855,7 @@ cc_genrule {
 cc_genrule {
     name: "cronet_aml_base_build_date__testing",
     cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
-         "1705445157",
+         "1712072430",
     host_supported: true,
     out: [
         "base/generated_build_date.h",
@@ -5965,9 +5965,9 @@ cc_genrule {
 // GN: //base:debugging_buildflags
 cc_genrule {
     name: "cronet_aml_base_debugging_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -5977,9 +5977,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -5989,9 +5989,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6001,9 +6001,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6013,7 +6013,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -6039,9 +6039,9 @@ cc_genrule {
 // GN: //base:debugging_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_debugging_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6051,7 +6051,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -6063,7 +6063,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -6075,9 +6075,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6087,9 +6087,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -6099,9 +6099,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
+         "mkdir -p $(genDir)/base/debug && echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"false\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"true\" ENABLE_GDBINIT_WARNING=\"false\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"false\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\" ENABLE_COMMANDLINE_SEQUENCE_CHECKS=\"false\" ENABLE_ALLOCATION_STACK_TRACE_RECORDER=\"false\" ENABLE_ALLOCATION_TRACE_RECORDER_FULL_REPORTING=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7168,9 +7168,9 @@ java_genrule {
 // GN: //base:profiler_buildflags
 cc_genrule {
     name: "cronet_aml_base_profiler_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"true\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7180,7 +7180,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7192,9 +7192,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"true\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7204,7 +7204,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7216,7 +7216,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7242,9 +7242,9 @@ cc_genrule {
 // GN: //base:profiler_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_profiler_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"true\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7254,7 +7254,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7266,7 +7266,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7278,9 +7278,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"true\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -7290,7 +7290,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -7302,7 +7302,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base/profiler && echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8498,7 +8498,7 @@ cc_genrule {
 // GN: //base:tracing_buildflags__testing
 cc_genrule {
     name: "cronet_aml_base_tracing_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8510,9 +8510,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
+         "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"true\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -8522,7 +8522,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8534,7 +8534,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8546,7 +8546,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -8558,9 +8558,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"true\"' | " +
+         "mkdir -p $(genDir)/base && echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"true\" USE_PERFETTO_TRACE_PROCESSOR=\"true\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -8989,7 +8989,7 @@ cc_genrule {
 // GN: //build/config/compiler:compiler_buildflags__testing
 cc_genrule {
     name: "cronet_aml_build_config_compiler_compiler_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -9001,9 +9001,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ $$CC_OS != 'android' ]]; " +
          "then " +
-         "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
+         "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"2\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -9013,7 +9013,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -9025,7 +9025,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -9037,7 +9037,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -9049,9 +9049,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ $$CC_OS != 'android' ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"2\" SYMBOL_LEVEL=\"1\"' | " +
+         "mkdir -p $(genDir)/build/config/compiler && echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19531,7 +19531,7 @@ cc_genrule {
 // GN: //net:buildflags
 cc_genrule {
     name: "cronet_aml_net_buildflags",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19543,9 +19543,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
+         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"false\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19555,7 +19555,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19567,9 +19567,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"false\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
+         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19579,7 +19579,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19605,7 +19605,7 @@ cc_genrule {
 // GN: //net:buildflags__testing
 cc_genrule {
     name: "cronet_aml_net_buildflags__testing",
-    cmd: "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
+    cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19617,9 +19617,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
+         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"false\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19629,7 +19629,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
@@ -19641,9 +19641,9 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
-         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"false\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
+         "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
          "$(out) " +
          "--rulename " +
@@ -19653,7 +19653,7 @@ cc_genrule {
          "--definitions " +
          "/dev/stdin; " +
          "fi; " +
-         "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
+         "if [[ ( $$CC_ARCH == 'riscv64' && $$CC_OS == 'android' ) ]]; " +
          "then " +
          "mkdir -p $(genDir)/net && echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" ENABLE_CLIENT_CERTIFICATES=\"true\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" CHROME_ROOT_STORE_OPTIONAL=\"false\" CHROME_ROOT_STORE_ONLY=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " +
          "$(location build/write_buildflag_header.py) --output " +
diff --git a/android/tools/gn2bp/gen_android_bp b/android/tools/gn2bp/gen_android_bp
index cec2de500..401994851 100755
--- a/android/tools/gn2bp/gen_android_bp
+++ b/android/tools/gn2bp/gen_android_bp
@@ -1556,7 +1556,7 @@ def merge_cmd(modules, genrule_type):
     raise Exception(f'{genrule_type} can not have different cmd between archs')
 
   merged_cmd = []
-  for arch, module in sorted(modules.items()):
+  for arch, module in modules.items():
     merged_cmd.append(f'if [[ {get_cmd_condition(arch)} ]];')
     merged_cmd.append('then')
     merged_cmd.append(module.cmd + ';')