diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 09e6b42..25583ed 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -923,9 +923,7 @@
          "--input_file " +
          "java/lang/Runtime.class " +
          "--javap " +
-         "$$(find $${OUT_DIR:-out}/.path -name javap) " +
-         "--package_prefix " +
-         "android.net.http.internal",
+         "$$(find $${OUT_DIR:-out}/.path -name javap)",
     out: [
         "base/android_runtime_jni_headers/Runnable_jni.h",
         "base/android_runtime_jni_headers/Runtime_jni.h",
@@ -3183,9 +3181,7 @@
          "--input_file " +
          "$(location base/android/java/src/org/chromium/base/task/PostTask.java) " +
          "--input_file " +
-         "$(location base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java) " +
-         "--package_prefix " +
-         "android.net.http.internal",
+         "$(location base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java)",
     out: [
         "base/base_jni_headers/ApkAssets_jni.h",
         "base/base_jni_headers/ApplicationStatus_jni.h",
@@ -4638,9 +4634,7 @@
          "--input_file " +
          "$(location base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java) " +
          "--input_file " +
-         "$(location base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java) " +
-         "--package_prefix " +
-         "android.net.http.internal",
+         "$(location base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java)",
     out: [
         "base/test/base_unittests_jni_headers/ContentUriTestUtils_jni.h",
         "base/test/base_unittests_jni_headers/JavaHandlerThreadHelpers_jni.h",
@@ -5075,9 +5069,7 @@
          "--input_file " +
          "$(location base/test/android/javatests/src/org/chromium/base/test/task/ThreadPoolTestHelpers.java) " +
          "--input_file " +
-         "$(location base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java) " +
-         "--package_prefix " +
-         "android.net.http.internal",
+         "$(location base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java)",
     out: [
         "base/test/test_support_jni_headers/MainReturnCodeResult_jni.h",
         "base/test/test_support_jni_headers/MultiprocessTestClientLauncher_jni.h",
@@ -6866,9 +6858,7 @@
          "--input_file " +
          "$(location components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java) " +
          "--input_file " +
-         "$(location components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java) " +
-         "--package_prefix " +
-         "android.net.http.internal",
+         "$(location components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java)",
     out: [
         "components/cronet/android/cronet_jni_headers/CronetBidirectionalStream_jni.h",
         "components/cronet/android/cronet_jni_headers/CronetLibraryLoader_jni.h",
@@ -7623,8 +7613,6 @@
          "--header-path " +
          "$(genDir)/components/cronet/android/cronet_jni_registration.h " +
          "--manual_jni_registration " +
-         "--package_prefix " +
-         "android.net.http.internal " +
          ";sed -i -e 's/OUT_SOONG_.TEMP_SBOX_.*_OUT/GEN/g'  " +
          "$(genDir)/components/cronet/android/cronet_jni_registration.h",
     out: [
@@ -9233,9 +9221,7 @@
          "--output_name " +
          "PrefService_jni.h " +
          "--input_file " +
-         "$(location components/prefs/android/java/src/org/chromium/components/prefs/PrefService.java) " +
-         "--package_prefix " +
-         "android.net.http.internal",
+         "$(location components/prefs/android/java/src/org/chromium/components/prefs/PrefService.java)",
     out: [
         "components/prefs/android/jni_headers/PrefService_jni.h",
     ],
@@ -13790,9 +13776,7 @@
          "--input_file " +
          "$(location net/android/java/src/org/chromium/net/ProxyChangeListener.java) " +
          "--input_file " +
-         "$(location net/android/java/src/org/chromium/net/X509Util.java) " +
-         "--package_prefix " +
-         "android.net.http.internal",
+         "$(location net/android/java/src/org/chromium/net/X509Util.java)",
     out: [
         "net/net_jni_headers/AndroidCertVerifyResult_jni.h",
         "net/net_jni_headers/AndroidKeyStore_jni.h",
@@ -16822,9 +16806,7 @@
          "--input_file " +
          "$(location testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java) " +
          "--input_file " +
-         "$(location testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java) " +
-         "--package_prefix " +
-         "android.net.http.internal",
+         "$(location testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java)",
     out: [
         "testing/android/native_test/native_test_jni_headers/MainRunner_jni.h",
         "testing/android/native_test/native_test_jni_headers/NativeTest_jni.h",
@@ -30126,9 +30108,7 @@
          "--input_file " +
          "$(location url/android/java/src/org/chromium/url/IDNStringUtil.java) " +
          "--input_file " +
-         "$(location url/android/java/src/org/chromium/url/Origin.java) " +
-         "--package_prefix " +
-         "android.net.http.internal",
+         "$(location url/android/java/src/org/chromium/url/Origin.java)",
     out: [
         "url/url_jni_headers/IDNStringUtil_jni.h",
         "url/url_jni_headers/Origin_jni.h",