Revert of Include isolate.py in data for Android unit tests

build/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
 import("//third_party/ijar/ijar.gni")
 
 sun_tools_jar_path = "$root_gen_dir/sun_tools_jar/tools.jar"
 
 # Create or update the API versions cache if necessary by running a
@@ skipping 66 matching lines @@
   _rebased_output_so = rebase_path(_output_so, root_out_dir)
   args = [
     _rebased_strip_bin,
     "--strip-unneeded",
     "-o",
     _rebased_output_so,
     _rebased_input_so,
   ]
 }
 
+group("devil_py") {
+  data = [
+    "devil_chromium.json",
+    "devil_chromium.py",
+    "//third_party/android_tools/sdk/build-tools/23.0.1/aapt",
+    "//third_party/android_tools/sdk/build-tools/23.0.1/dexdump",
+    "//third_party/android_tools/sdk/build-tools/23.0.1/lib/libc++.so",
+    "//third_party/android_tools/sdk/build-tools/23.0.1/split-select",
+    "//third_party/android_tools/sdk/platform-tools/adb",
+    "//third_party/catapult/catapult_base/catapult_base/",
+    "//third_party/catapult/dependency_manager/dependency_manager/",
+    "//third_party/catapult/third_party/gsutil/",
+    "//third_party/catapult/devil/devil/",
+  ]
+}
+
 group("test_runner_py") {
-  _py_files = read_file("test_runner.pydeps", "list lines")
-
-  # Filter out comments.
-  set_sources_assignment_filter([ "#*" ])
-  sources = _py_files
-
-  data = sources + [
-           "devil_chromium.json",
-           "//third_party/android_tools/sdk/build-tools/23.0.1/aapt",
-           "//third_party/android_tools/sdk/build-tools/23.0.1/dexdump",
-           "//third_party/android_tools/sdk/build-tools/23.0.1/lib/libc++.so",
-           "//third_party/android_tools/sdk/build-tools/23.0.1/split-select",
-           "//third_party/android_tools/sdk/platform-tools/adb",
-           "//third_party/catapult/third_party/gsutil/",
-           "//third_party/catapult/devil/devil/devil_dependencies.json",
-         ]
+  data = [
+    "test_runner.py",
+    "pylib/",
+    "//build/util/lib/common/",
+  ]
   data_deps = [
-    "//tools/swarming_client:isolate_py",
+    ":devil_py",
   ]
 }
 
 # Create wrapper scripts in out/bin that takes care of setting the
 # --output-directory.
 _scripts_to_wrap = [
   # TODO(agrieve): Once GYP is no more, delete the checked-in adb_gdb_* scripts
   # and generated a script for each android_apk() that has a native library.
   "adb_gdb_android_webview_shell",
   "adb_gdb_blimp_client",
@@ skipping 10 matching lines @@
   _target_name = get_path_info(script, "name") + "_wrapper"
   _wrapper_targets += [ ":$_target_name" ]
   wrapper_script(_target_name) {
     target = script
   }
 }
 
 group("wrapper_scripts") {
   deps = _wrapper_targets
 }