diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index f9f1635..031f38a 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -4547,18 +4547,6 @@
         "base/android/java/src/org/chromium/base/metrics/TimingMetric.java",
         "base/android/java/src/org/chromium/base/metrics/UmaRecorder.java",
         "base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java",
-        "base/android/java/src/org/chromium/base/process_launcher/BindService.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java",
-        "base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java",
         "base/android/java/src/org/chromium/base/supplier/BooleanSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java",
@@ -4585,21 +4573,6 @@
         "base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java",
         "base/android/java/src/org/chromium/base/task/TaskTraits.java",
         "base/android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
-        "base/test/android/java/src/org/chromium/base/GarbageCollectionTestUtils.java",
-        "base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService0.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService1.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService2.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService3.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService4.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService5.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService6.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService7.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService8.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService9.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientServiceDelegate.java",
         "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java",
         "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
         "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java",
@@ -4665,8 +4638,6 @@
         "net/android/java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java",
         "net/android/java/src/org/chromium/net/ThreadStatsUid.java",
         "net/android/java/src/org/chromium/net/X509Util.java",
-        "testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java",
-        "third_party/android_deps/local_modifications/preconditions/java/androidx/core/util/Preconditions.java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     cmd: "current_dir=`basename \\`pwd\\``; " +
@@ -4829,18 +4800,6 @@
         "base/android/java/src/org/chromium/base/metrics/TimingMetric.java",
         "base/android/java/src/org/chromium/base/metrics/UmaRecorder.java",
         "base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java",
-        "base/android/java/src/org/chromium/base/process_launcher/BindService.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java",
-        "base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java",
         "base/android/java/src/org/chromium/base/supplier/BooleanSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java",
         "base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java",
@@ -4867,21 +4826,6 @@
         "base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java",
         "base/android/java/src/org/chromium/base/task/TaskTraits.java",
         "base/android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
-        "base/test/android/java/src/org/chromium/base/GarbageCollectionTestUtils.java",
-        "base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService0.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService1.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService2.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService3.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService4.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService5.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService6.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService7.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService8.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService9.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientServiceDelegate.java",
         "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java",
         "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
         "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java",
@@ -4947,8 +4891,6 @@
         "net/android/java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java",
         "net/android/java/src/org/chromium/net/ThreadStatsUid.java",
         "net/android/java/src/org/chromium/net/X509Util.java",
-        "testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java",
-        "third_party/android_deps/local_modifications/preconditions/java/androidx/core/util/Preconditions.java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     cmd: "current_dir=`basename \\`pwd\\``; " +
@@ -6845,18 +6787,6 @@
         "base/android/java/src/org/chromium/base/metrics/TimingMetric.java",
         "base/android/java/src/org/chromium/base/metrics/UmaRecorder.java",
         "base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java",
-        "base/android/java/src/org/chromium/base/process_launcher/BindService.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java",
-        "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java",
-        "base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java",
         "base/android/java/src/org/chromium/base/process_launcher/IChildProcessService.aidl",
         "base/android/java/src/org/chromium/base/process_launcher/IParentProcess.aidl",
         "base/android/java/src/org/chromium/base/supplier/BooleanSupplier.java",
@@ -6885,23 +6815,8 @@
         "base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java",
         "base/android/java/src/org/chromium/base/task/TaskTraits.java",
         "base/android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
-        "base/test/android/java/src/org/chromium/base/GarbageCollectionTestUtils.java",
         "base/test/android/java/src/org/chromium/base/ITestCallback.aidl",
         "base/test/android/java/src/org/chromium/base/ITestController.aidl",
-        "base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService0.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService1.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService2.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService3.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService4.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService5.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService6.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService7.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService8.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientService9.java",
-        "base/test/android/java/src/org/chromium/base/MultiprocessTestClientServiceDelegate.java",
         "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java",
         "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
         "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java",
@@ -6967,8 +6882,6 @@
         "net/android/java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java",
         "net/android/java/src/org/chromium/net/ThreadStatsUid.java",
         "net/android/java/src/org/chromium/net/X509Util.java",
-        "testing/android/native_test/java/src/org/chromium/native_test/MainRunner.java",
-        "third_party/android_deps/local_modifications/preconditions/java/androidx/core/util/Preconditions.java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     static_libs: [
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 2c4dfe2..32c9a2b 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1825,7 +1825,7 @@
     with open(desc_file) as f:
       desc = json.load(f)
     for target in targets:
-      gn.parse_gn_desc(desc, target)
+      gn.parse_gn_desc(desc, target, is_test_target=target in DEFAULT_TESTS)
   blueprint = create_blueprint_for_targets(gn, targets)
   project_root = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
   tool_name = os.path.relpath(os.path.abspath(__file__), project_root)
diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index e5e714e..9fcbcf7 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -323,7 +323,7 @@
 
     return self.all_targets[label_without_toolchain(gn_target_name)]
 
-  def parse_gn_desc(self, gn_desc, gn_target_name, java_group_name=None):
+  def parse_gn_desc(self, gn_desc, gn_target_name, java_group_name=None, is_test_target=False):
     """Parses a gn desc tree and resolves all target dependencies.
 
         It bubbles up variables from source_set dependencies as described in the
@@ -416,7 +416,7 @@
 
     # Recurse in dependencies.
     for gn_dep_name in desc.get('deps', []):
-      dep = self.parse_gn_desc(gn_desc, gn_dep_name, java_group_name)
+      dep = self.parse_gn_desc(gn_desc, gn_dep_name, java_group_name, is_test_target)
       if dep.type == 'proto_library':
         target.proto_deps.add(dep.name)
         target.transitive_proto_deps.add(dep.name)
@@ -466,7 +466,11 @@
         if dep.name.endswith('__compile_java'):
           log.debug('Adding java sources for %s', dep.name)
           java_srcs = [src for src in dep.inputs if _is_java_source(src)]
-          self.java_sources[java_group_name].update(java_srcs)
+          if not is_test_target:
+            # TODO(aymanm): Fix collecting sources for testing modules for java.
+            # Don't collect java source files for test targets.
+            # We only need a specific set of java sources which are hardcoded in gen_android_bp
+            self.java_sources[java_group_name].update(java_srcs)
       if dep.type in ["action"] and target.type == "java_group":
         # GN uses an action to compile aidl files. However, this is not needed in soong
         # as soong can directly have .aidl files in srcs. So adding .aidl files to the java_sources.
@@ -475,7 +479,10 @@
           self.java_sources[java_group_name].update(dep.arch[arch].sources)
           self.aidl_local_include_dirs.update(_extract_includes_from_aidl_args(dep.arch[arch].args))
         else:
-          self.java_actions[java_group_name].add(dep.name)
+          if not is_test_target:
+            # TODO(aymanm): Fix collecting actions for testing modules for java.
+            # Don't collect java actions for test targets.
+            self.java_actions[java_group_name].add(dep.name)
     return target
 
   def get_proto_exports(self, proto_desc):