diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index ffb66af..c044321 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -17,7 +17,15 @@
 // GN: //base/allocator:buildflags
 genrule {
     name: "cronet_aml_base_allocator_buildflags",
-    cmd: "echo '--flags USE_PARTITION_ALLOC=false USE_ALLOCATOR_SHIM=true USE_PARTITION_ALLOC_AS_MALLOC=false USE_BACKUP_REF_PTR=false USE_ASAN_BACKUP_REF_PTR=false USE_PARTITION_ALLOC_AS_GWP_ASAN_STORE=false USE_MTE_CHECKED_PTR=false FORCE_ENABLE_RAW_PTR_EXCLUSION=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base/allocator:buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags USE_PARTITION_ALLOC=false USE_ALLOCATOR_SHIM=true USE_PARTITION_ALLOC_AS_MALLOC=false USE_BACKUP_REF_PTR=false USE_ASAN_BACKUP_REF_PTR=false USE_PARTITION_ALLOC_AS_GWP_ASAN_STORE=false USE_MTE_CHECKED_PTR=false FORCE_ENABLE_RAW_PTR_EXCLUSION=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base/allocator:buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/allocator/buildflags.h",
     ],
@@ -29,7 +37,15 @@
 // GN: //base/allocator/partition_allocator:chromecast_buildflags
 genrule {
     name: "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags",
-    cmd: "echo '--flags PA_IS_CAST_ANDROID=false PA_IS_CASTOS=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base/allocator/partition_allocator:chromecast_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags PA_IS_CAST_ANDROID=false PA_IS_CASTOS=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base/allocator/partition_allocator:chromecast_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/allocator/partition_allocator/chromecast_buildflags.h",
     ],
@@ -41,7 +57,15 @@
 // GN: //base/allocator/partition_allocator:chromeos_buildflags
 genrule {
     name: "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags",
-    cmd: "echo '--flags PA_IS_CHROMEOS_ASH=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base/allocator/partition_allocator:chromeos_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags PA_IS_CHROMEOS_ASH=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base/allocator/partition_allocator:chromeos_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/allocator/partition_allocator/chromeos_buildflags.h",
     ],
@@ -53,7 +77,15 @@
 // GN: //base/allocator/partition_allocator:debugging_buildflags
 genrule {
     name: "cronet_aml_base_allocator_partition_allocator_debugging_buildflags",
-    cmd: "echo '--flags PA_DCHECK_IS_ON=true PA_EXPENSIVE_DCHECKS_ARE_ON=true PA_DCHECK_IS_CONFIGURABLE=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base/allocator/partition_allocator:debugging_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags PA_DCHECK_IS_ON=true PA_EXPENSIVE_DCHECKS_ARE_ON=true PA_DCHECK_IS_CONFIGURABLE=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base/allocator/partition_allocator:debugging_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/allocator/partition_allocator/partition_alloc_base/debug/debugging_buildflags.h",
     ],
@@ -65,7 +97,15 @@
 // GN: //base/allocator/partition_allocator:logging_buildflags
 genrule {
     name: "cronet_aml_base_allocator_partition_allocator_logging_buildflags",
-    cmd: "echo '--flags PA_ENABLE_LOG_ERROR_NOT_REACHED=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base/allocator/partition_allocator:logging_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags PA_ENABLE_LOG_ERROR_NOT_REACHED=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base/allocator/partition_allocator:logging_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/allocator/partition_allocator/logging_buildflags.h",
     ],
@@ -181,7 +221,15 @@
 // GN: //base/allocator/partition_allocator:partition_alloc_buildflags
 genrule {
     name: "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags",
-    cmd: "echo '--flags ENABLE_PARTITION_ALLOC_AS_MALLOC_SUPPORT=true ENABLE_BACKUP_REF_PTR_SUPPORT=true ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=false ENABLE_DANGLING_RAW_PTR_CHECKS=false PUT_REF_COUNT_IN_PREVIOUS_SLOT=true ENABLE_GWP_ASAN_SUPPORT=true ENABLE_MTE_CHECKED_PTR_SUPPORT=false RECORD_ALLOC_INFO=false USE_FREESLOT_BITMAP=false GLUE_CORE_POOLS=false ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=false STARSCAN=true PA_USE_BASE_TRACING=true ENABLE_PKEYS=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base/allocator/partition_allocator:partition_alloc_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags ENABLE_PARTITION_ALLOC_AS_MALLOC_SUPPORT=true ENABLE_BACKUP_REF_PTR_SUPPORT=true ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=false ENABLE_DANGLING_RAW_PTR_CHECKS=false PUT_REF_COUNT_IN_PREVIOUS_SLOT=true ENABLE_GWP_ASAN_SUPPORT=true ENABLE_MTE_CHECKED_PTR_SUPPORT=false RECORD_ALLOC_INFO=false USE_FREESLOT_BITMAP=false GLUE_CORE_POOLS=false ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=false STARSCAN=true PA_USE_BASE_TRACING=true ENABLE_PKEYS=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base/allocator/partition_allocator:partition_alloc_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/allocator/partition_allocator/partition_alloc_buildflags.h",
     ],
@@ -193,7 +241,15 @@
 // GN: //base:anchor_functions_buildflags
 genrule {
     name: "cronet_aml_base_anchor_functions_buildflags",
-    cmd: "echo '--flags USE_LLD=true SUPPORTS_CODE_ORDERING=true' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:anchor_functions_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags USE_LLD=true SUPPORTS_CODE_ORDERING=true' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:anchor_functions_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/android/library_loader/anchor_functions_buildflags.h",
     ],
@@ -205,7 +261,24 @@
 // GN: //base:android_runtime_jni_headers
 genrule {
     name: "cronet_aml_base_android_runtime_jni_headers",
-    cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type=long --prev_output_dir gen/base/android_runtime_jni_headers --output_dir gen/jni_headers/base/android_runtime_jni_headers --includes //../../../../base/android/jni_generator/jni_generator_helper.h --jar_file //third_party/android_sdk/public/platforms/android-33/android.jar --output_name Runnable_jni.h --output_name Runtime_jni.h --input_file=java/lang/Runnable.class --input_file=java/lang/Runtime.class",
+    cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " +
+         "long " +
+         "--prev_output_dir " +
+         "gen/base/android_runtime_jni_headers " +
+         "--output_dir " +
+         "gen/jni_headers/base/android_runtime_jni_headers " +
+         "--includes " +
+         "//../../../../base/android/jni_generator/jni_generator_helper.h " +
+         "--jar_file " +
+         "//third_party/android_sdk/public/platforms/android-33/android.jar " +
+         "--output_name " +
+         "Runnable_jni.h " +
+         "--output_name " +
+         "Runtime_jni.h " +
+         "--input_file " +
+         "java/lang/Runnable.class " +
+         "--input_file " +
+         "java/lang/Runtime.class",
     out: [
         "jni_headers/base/android_runtime_jni_headers/Runnable_jni.h",
         "jni_headers/base/android_runtime_jni_headers/Runtime_jni.h",
@@ -936,7 +1009,175 @@
         "base/android/java/src/org/chromium/base/task/PostTask.java",
         "base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java",
     ],
-    cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type=long --prev_output_dir gen/base/base_jni_headers --output_dir gen/jni_headers/base/base_jni_headers --includes //../../../../base/android/jni_generator/jni_generator_helper.h --use_proxy_hash --output_name ApkAssets_jni.h --output_name ApplicationStatus_jni.h --output_name BaseFeatureList_jni.h --output_name BuildInfo_jni.h --output_name BundleUtils_jni.h --output_name Callback_jni.h --output_name CommandLine_jni.h --output_name ContentUriUtils_jni.h --output_name CpuFeatures_jni.h --output_name EarlyTraceEvent_jni.h --output_name EventLog_jni.h --output_name FeatureList_jni.h --output_name Features_jni.h --output_name FieldTrialList_jni.h --output_name FileUtils_jni.h --output_name ImportantFileWriterAndroid_jni.h --output_name IntStringCallback_jni.h --output_name JNIUtils_jni.h --output_name JavaExceptionReporter_jni.h --output_name JavaHandlerThread_jni.h --output_name LocaleUtils_jni.h --output_name MemoryPressureListener_jni.h --output_name PathService_jni.h --output_name PathUtils_jni.h --output_name PowerMonitor_jni.h --output_name RadioUtils_jni.h --output_name SysUtils_jni.h --output_name ThreadUtils_jni.h --output_name TimezoneUtils_jni.h --output_name TraceEvent_jni.h --output_name UnguessableToken_jni.h --output_name JankMetricUMARecorder_jni.h --output_name LibraryLoader_jni.h --output_name LibraryPrefetcher_jni.h --output_name JavaHeapDumpGenerator_jni.h --output_name NativeUmaRecorder_jni.h --output_name StatisticsRecorderAndroid_jni.h --output_name ChildProcessService_jni.h --output_name PostTask_jni.h --output_name TaskRunnerImpl_jni.h --input_file=../../base/android/java/src/org/chromium/base/ApkAssets.java --input_file=../../base/android/java/src/org/chromium/base/ApplicationStatus.java --input_file=../../base/android/java/src/org/chromium/base/BaseFeatureList.java --input_file=../../base/android/java/src/org/chromium/base/BuildInfo.java --input_file=../../base/android/java/src/org/chromium/base/BundleUtils.java --input_file=../../base/android/java/src/org/chromium/base/Callback.java --input_file=../../base/android/java/src/org/chromium/base/CommandLine.java --input_file=../../base/android/java/src/org/chromium/base/ContentUriUtils.java --input_file=../../base/android/java/src/org/chromium/base/CpuFeatures.java --input_file=../../base/android/java/src/org/chromium/base/EarlyTraceEvent.java --input_file=../../base/android/java/src/org/chromium/base/EventLog.java --input_file=../../base/android/java/src/org/chromium/base/FeatureList.java --input_file=../../base/android/java/src/org/chromium/base/Features.java --input_file=../../base/android/java/src/org/chromium/base/FieldTrialList.java --input_file=../../base/android/java/src/org/chromium/base/FileUtils.java --input_file=../../base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java --input_file=../../base/android/java/src/org/chromium/base/IntStringCallback.java --input_file=../../base/android/java/src/org/chromium/base/JNIUtils.java --input_file=../../base/android/java/src/org/chromium/base/JavaExceptionReporter.java --input_file=../../base/android/java/src/org/chromium/base/JavaHandlerThread.java --input_file=../../base/android/java/src/org/chromium/base/LocaleUtils.java --input_file=../../base/android/java/src/org/chromium/base/MemoryPressureListener.java --input_file=../../base/android/java/src/org/chromium/base/PathService.java --input_file=../../base/android/java/src/org/chromium/base/PathUtils.java --input_file=../../base/android/java/src/org/chromium/base/PowerMonitor.java --input_file=../../base/android/java/src/org/chromium/base/RadioUtils.java --input_file=../../base/android/java/src/org/chromium/base/SysUtils.java --input_file=../../base/android/java/src/org/chromium/base/ThreadUtils.java --input_file=../../base/android/java/src/org/chromium/base/TimezoneUtils.java --input_file=../../base/android/java/src/org/chromium/base/TraceEvent.java --input_file=../../base/android/java/src/org/chromium/base/UnguessableToken.java --input_file=../../base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java --input_file=../../base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java --input_file=../../base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java --input_file=../../base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java --input_file=../../base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java --input_file=../../base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java --input_file=../../base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java --input_file=../../base/android/java/src/org/chromium/base/task/PostTask.java --input_file=../../base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java",
+    cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " +
+         "long " +
+         "--prev_output_dir " +
+         "gen/base/base_jni_headers " +
+         "--output_dir " +
+         "gen/jni_headers/base/base_jni_headers " +
+         "--includes " +
+         "//../../../../base/android/jni_generator/jni_generator_helper.h " +
+         "--use_proxy_hash " +
+         "--output_name " +
+         "ApkAssets_jni.h " +
+         "--output_name " +
+         "ApplicationStatus_jni.h " +
+         "--output_name " +
+         "BaseFeatureList_jni.h " +
+         "--output_name " +
+         "BuildInfo_jni.h " +
+         "--output_name " +
+         "BundleUtils_jni.h " +
+         "--output_name " +
+         "Callback_jni.h " +
+         "--output_name " +
+         "CommandLine_jni.h " +
+         "--output_name " +
+         "ContentUriUtils_jni.h " +
+         "--output_name " +
+         "CpuFeatures_jni.h " +
+         "--output_name " +
+         "EarlyTraceEvent_jni.h " +
+         "--output_name " +
+         "EventLog_jni.h " +
+         "--output_name " +
+         "FeatureList_jni.h " +
+         "--output_name " +
+         "Features_jni.h " +
+         "--output_name " +
+         "FieldTrialList_jni.h " +
+         "--output_name " +
+         "FileUtils_jni.h " +
+         "--output_name " +
+         "ImportantFileWriterAndroid_jni.h " +
+         "--output_name " +
+         "IntStringCallback_jni.h " +
+         "--output_name " +
+         "JNIUtils_jni.h " +
+         "--output_name " +
+         "JavaExceptionReporter_jni.h " +
+         "--output_name " +
+         "JavaHandlerThread_jni.h " +
+         "--output_name " +
+         "LocaleUtils_jni.h " +
+         "--output_name " +
+         "MemoryPressureListener_jni.h " +
+         "--output_name " +
+         "PathService_jni.h " +
+         "--output_name " +
+         "PathUtils_jni.h " +
+         "--output_name " +
+         "PowerMonitor_jni.h " +
+         "--output_name " +
+         "RadioUtils_jni.h " +
+         "--output_name " +
+         "SysUtils_jni.h " +
+         "--output_name " +
+         "ThreadUtils_jni.h " +
+         "--output_name " +
+         "TimezoneUtils_jni.h " +
+         "--output_name " +
+         "TraceEvent_jni.h " +
+         "--output_name " +
+         "UnguessableToken_jni.h " +
+         "--output_name " +
+         "JankMetricUMARecorder_jni.h " +
+         "--output_name " +
+         "LibraryLoader_jni.h " +
+         "--output_name " +
+         "LibraryPrefetcher_jni.h " +
+         "--output_name " +
+         "JavaHeapDumpGenerator_jni.h " +
+         "--output_name " +
+         "NativeUmaRecorder_jni.h " +
+         "--output_name " +
+         "StatisticsRecorderAndroid_jni.h " +
+         "--output_name " +
+         "ChildProcessService_jni.h " +
+         "--output_name " +
+         "PostTask_jni.h " +
+         "--output_name " +
+         "TaskRunnerImpl_jni.h " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/ApkAssets.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/ApplicationStatus.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/BaseFeatureList.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/BuildInfo.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/BundleUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/Callback.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/CommandLine.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/ContentUriUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/CpuFeatures.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/EarlyTraceEvent.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/EventLog.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/FeatureList.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/Features.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/FieldTrialList.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/FileUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/IntStringCallback.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/JNIUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/JavaExceptionReporter.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/JavaHandlerThread.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/LocaleUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/MemoryPressureListener.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/PathService.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/PathUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/PowerMonitor.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/RadioUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/SysUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/ThreadUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/TimezoneUtils.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/TraceEvent.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/UnguessableToken.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/task/PostTask.java " +
+         "--input_file " +
+         "../../base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java",
     out: [
         "jni_headers/base/base_jni_headers/ApkAssets_jni.h",
         "jni_headers/base/base_jni_headers/ApplicationStatus_jni.h",
@@ -1029,7 +1270,8 @@
 // GN: //base:build_date
 genrule {
     name: "cronet_aml_base_build_date",
-    cmd: "$(location build/write_build_date_header.py) $(out) 1664686800",
+    cmd: "$(location build/write_build_date_header.py) $(out) " +
+         "1664686800",
     out: [
         "base/generated_build_date.h",
     ],
@@ -1041,7 +1283,15 @@
 // GN: //base:cfi_buildflags
 genrule {
     name: "cronet_aml_base_cfi_buildflags",
-    cmd: "echo '--flags CFI_CAST_CHECK=false && false CFI_DIAG=false && false CFI_ICALL_CHECK=false && false CFI_ENFORCEMENT_TRAP=false && !false CFI_ENFORCEMENT_DIAGNOSTIC=false && false && !false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:cfi_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags CFI_CAST_CHECK=false && false CFI_DIAG=false && false CFI_ICALL_CHECK=false && false CFI_ENFORCEMENT_TRAP=false && !false CFI_ENFORCEMENT_DIAGNOSTIC=false && false && !false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:cfi_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/cfi_buildflags.h",
     ],
@@ -1053,7 +1303,15 @@
 // GN: //base:clang_profiling_buildflags
 genrule {
     name: "cronet_aml_base_clang_profiling_buildflags",
-    cmd: "echo '--flags CLANG_PROFILING=false CLANG_PROFILING_INSIDE_SANDBOX=false USE_CLANG_COVERAGE=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:clang_profiling_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags CLANG_PROFILING=false CLANG_PROFILING_INSIDE_SANDBOX=false USE_CLANG_COVERAGE=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:clang_profiling_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/clang_profiling_buildflags.h",
     ],
@@ -1065,7 +1323,15 @@
 // GN: //base:debugging_buildflags
 genrule {
     name: "cronet_aml_base_debugging_buildflags",
-    cmd: "echo '--flags DCHECK_IS_CONFIGURABLE=false ENABLE_LOCATION_SOURCE=true ENABLE_PROFILING=false CAN_UNWIND_WITH_FRAME_POINTERS=false UNSAFE_DEVELOPER_BUILD=true CAN_UNWIND_WITH_CFI_TABLE=true EXCLUDE_UNWIND_TABLES=false ENABLE_GDBINIT_WARNING=true ENABLE_LLDBINIT_WARNING=false EXPENSIVE_DCHECKS_ARE_ON=true ENABLE_STACK_TRACE_LINE_NUMBERS=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:debugging_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags DCHECK_IS_CONFIGURABLE=false ENABLE_LOCATION_SOURCE=true ENABLE_PROFILING=false CAN_UNWIND_WITH_FRAME_POINTERS=false UNSAFE_DEVELOPER_BUILD=true CAN_UNWIND_WITH_CFI_TABLE=true EXCLUDE_UNWIND_TABLES=false ENABLE_GDBINIT_WARNING=true ENABLE_LLDBINIT_WARNING=false EXPENSIVE_DCHECKS_ARE_ON=true ENABLE_STACK_TRACE_LINE_NUMBERS=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:debugging_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/debug/debugging_buildflags.h",
     ],
@@ -1077,7 +1343,15 @@
 // GN: //base:feature_list_buildflags
 genrule {
     name: "cronet_aml_base_feature_list_buildflags",
-    cmd: "echo '--flags ENABLE_BANNED_BASE_FEATURE_PREFIX=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:feature_list_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags ENABLE_BANNED_BASE_FEATURE_PREFIX=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:feature_list_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/feature_list_buildflags.h",
     ],
@@ -1089,7 +1363,15 @@
 // GN: //base:ios_cronet_buildflags
 genrule {
     name: "cronet_aml_base_ios_cronet_buildflags",
-    cmd: "echo '--flags CRONET_BUILD=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:ios_cronet_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags CRONET_BUILD=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:ios_cronet_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/message_loop/ios_cronet_buildflags.h",
     ],
@@ -1101,7 +1383,15 @@
 // GN: //base:logging_buildflags
 genrule {
     name: "cronet_aml_base_logging_buildflags",
-    cmd: "echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=false USE_RUNTIME_VLOG=true' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:logging_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=false USE_RUNTIME_VLOG=true' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:logging_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/logging_buildflags.h",
     ],
@@ -1113,7 +1403,15 @@
 // GN: //base:message_pump_buildflags
 genrule {
     name: "cronet_aml_base_message_pump_buildflags",
-    cmd: "echo '--flags ENABLE_MESSAGE_PUMP_EPOLL=true' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:message_pump_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags ENABLE_MESSAGE_PUMP_EPOLL=true' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:message_pump_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/message_loop/message_pump_buildflags.h",
     ],
@@ -1130,7 +1428,15 @@
 // GN: //base:orderfile_buildflags
 genrule {
     name: "cronet_aml_base_orderfile_buildflags",
-    cmd: "echo '--flags DEVTOOLS_INSTRUMENTATION_DUMPING=false ORDERFILE_INSTRUMENTATION=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:orderfile_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags DEVTOOLS_INSTRUMENTATION_DUMPING=false ORDERFILE_INSTRUMENTATION=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:orderfile_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/android/orderfile/orderfile_buildflags.h",
     ],
@@ -1142,7 +1448,15 @@
 // GN: //base:parsing_buildflags
 genrule {
     name: "cronet_aml_base_parsing_buildflags",
-    cmd: "echo '--flags BUILD_RUST_JSON_PARSER=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:parsing_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags BUILD_RUST_JSON_PARSER=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:parsing_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/parsing_buildflags.h",
     ],
@@ -1154,7 +1468,15 @@
 // GN: //base:power_monitor_buildflags
 genrule {
     name: "cronet_aml_base_power_monitor_buildflags",
-    cmd: "echo '--flags HAS_BATTERY_LEVEL_PROVIDER_IMPL=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:power_monitor_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags HAS_BATTERY_LEVEL_PROVIDER_IMPL=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:power_monitor_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/power_monitor/power_monitor_buildflags.h",
     ],
@@ -1166,7 +1488,15 @@
 // GN: //base:profiler_buildflags
 genrule {
     name: "cronet_aml_base_profiler_buildflags",
-    cmd: "echo '--flags ENABLE_ARM_CFI_TABLE=true IOS_STACK_PROFILER_ENABLED=true USE_ANDROID_UNWINDER_V2=true' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:profiler_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags ENABLE_ARM_CFI_TABLE=true IOS_STACK_PROFILER_ENABLED=true USE_ANDROID_UNWINDER_V2=true' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:profiler_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/profiler/profiler_buildflags.h",
     ],
@@ -1178,7 +1508,15 @@
 // GN: //base:sanitizer_buildflags
 genrule {
     name: "cronet_aml_base_sanitizer_buildflags",
-    cmd: "echo '--flags IS_HWASAN=false USING_SANITIZER=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:sanitizer_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags IS_HWASAN=false USING_SANITIZER=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:sanitizer_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/sanitizer_buildflags.h",
     ],
@@ -1190,7 +1528,15 @@
 // GN: //base:synchronization_buildflags
 genrule {
     name: "cronet_aml_base_synchronization_buildflags",
-    cmd: "echo '--flags ENABLE_MUTEX_PRIORITY_INHERITANCE=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:synchronization_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags ENABLE_MUTEX_PRIORITY_INHERITANCE=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:synchronization_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/synchronization/synchronization_buildflags.h",
     ],
@@ -1273,7 +1619,15 @@
 // GN: //base:tracing_buildflags
 genrule {
     name: "cronet_aml_base_tracing_buildflags",
-    cmd: "echo '--flags ENABLE_BASE_TRACING=false USE_PERFETTO_CLIENT_LIBRARY=false OPTIONAL_TRACE_EVENTS_ENABLED=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //base:tracing_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags ENABLE_BASE_TRACING=false USE_PERFETTO_CLIENT_LIBRARY=false OPTIONAL_TRACE_EVENTS_ENABLED=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//base:tracing_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "base/tracing_buildflags.h",
     ],
@@ -1285,7 +1639,15 @@
 // GN: //build:branding_buildflags
 genrule {
     name: "cronet_aml_build_branding_buildflags",
-    cmd: "echo '--flags CHROMIUM_BRANDING=1 GOOGLE_CHROME_BRANDING=0' | $(location build/write_buildflag_header.py) --output $(out) --rulename //build:branding_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags CHROMIUM_BRANDING=1 GOOGLE_CHROME_BRANDING=0' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//build:branding_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "build/branding_buildflags.h",
     ],
@@ -1302,7 +1664,15 @@
 // GN: //build:chromecast_buildflags
 genrule {
     name: "cronet_aml_build_chromecast_buildflags",
-    cmd: "echo '--flags IS_CASTOS=false IS_CAST_ANDROID=false ENABLE_CAST_RECEIVER=false IS_CHROMECAST=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //build:chromecast_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags IS_CASTOS=false IS_CAST_ANDROID=false ENABLE_CAST_RECEIVER=false IS_CHROMECAST=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//build:chromecast_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "build/chromecast_buildflags.h",
     ],
@@ -1314,7 +1684,15 @@
 // GN: //build:chromeos_buildflags
 genrule {
     name: "cronet_aml_build_chromeos_buildflags",
-    cmd: "echo '--flags IS_CHROMEOS_DEVICE=false IS_CHROMEOS_LACROS=false IS_CHROMEOS_ASH=false IS_CHROMEOS_WITH_HW_DETAILS=false IS_REVEN=false' | $(location build/write_buildflag_header.py) --output $(out) --rulename //build:chromeos_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags IS_CHROMEOS_DEVICE=false IS_CHROMEOS_LACROS=false IS_CHROMEOS_ASH=false IS_CHROMEOS_WITH_HW_DETAILS=false IS_REVEN=false' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//build:chromeos_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "build/chromeos_buildflags.h",
     ],
@@ -1326,7 +1704,15 @@
 // GN: //build/config/compiler:compiler_buildflags
 genrule {
     name: "cronet_aml_build_config_compiler_compiler_buildflags",
-    cmd: "echo '--flags CLANG_PGO=0 SYMBOL_LEVEL=1' | $(location build/write_buildflag_header.py) --output $(out) --rulename //build/config/compiler:compiler_buildflags --gen-dir . --definitions /dev/stdin",
+    cmd: "echo '--flags CLANG_PGO=0 SYMBOL_LEVEL=1' | " +
+         "$(location build/write_buildflag_header.py) --output " +
+         "$(out) " +
+         "--rulename " +
+         "//build/config/compiler:compiler_buildflags " +
+         "--gen-dir " +
+         ". " +
+         "--definitions " +
+         "/dev/stdin",
     out: [
         "build/config/compiler/compiler_buildflags.h",
     ],
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 9ba1c80..476dbcf 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -667,6 +667,11 @@
 # There may be a better way to do target specific modification
 # Target specific modification before create_action_module
 def pre_create_action_module(target):
+  # Convert ['--param=value'] to ['--param', 'value'] for consistency.
+  # TODO: we may want to only do this for python scripts arguments. If argparse
+  # is used, this transformation is safe.
+  target.args = [str for it in target.args for str in it.split('=')]
+
   if target.script == "//build/write_buildflag_header.py":
     # write_buildflag_header.py writes result to args.genDir/args.output
     # So, override args.genDir by '.' so that args.output=$(out) works
@@ -694,12 +699,14 @@
     # Replace {{response_file_contents}} with /dev/stdin
     target.args = ['/dev/stdin' if it == response_file else it for it in target.args]
 
-  arg_string = ' '.join(target.args)
+  # put all args on a new line for better diffs.
+  NEWLINE = ' " +\n         "'
+  arg_string = NEWLINE.join(target.args)
   module.cmd = '$(location %s) %s' % (script, arg_string)
 
   if use_response_file:
     # Pipe response file contents into script
-    module.cmd = 'echo \'%s\' | %s' % (target.response_file_contents, module.cmd)
+    module.cmd = 'echo \'%s\' |%s%s' % (target.response_file_contents, NEWLINE, module.cmd)
 
   if all(os.path.splitext(it)[1] == '.h' for it in target.outputs):
     module.genrule_headers.add(bp_module_name)