diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 9386a23..820cedf 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -3176,6 +3176,12 @@
         "cronet_aml_third_party_zlib_zlib",
         "cronet_aml_url_url",
     ],
+    whole_static_libs: [
+        "cronet_aml_base_base",
+        "cronet_aml_crypto_crypto",
+        "cronet_aml_net_third_party_quiche_quiche",
+        "cronet_aml_third_party_boringssl_boringssl",
+    ],
     generated_headers: [
         "cronet_aml_base_debugging_buildflags",
         "cronet_aml_base_logging_buildflags",
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 47232a1..2caf805 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -113,6 +113,12 @@
             'cronet_aml_net_third_party_quiche_quiche',
             'cronet_aml_crypto_crypto',
         }),
+        ('whole_static_libs', {
+            'cronet_aml_net_third_party_quiche_quiche',
+            'cronet_aml_base_base',
+            "cronet_aml_crypto_crypto",
+            "cronet_aml_third_party_boringssl_boringssl",
+        }),
     ]
 }