Android Add missing GN data to make base_unittests run with swarming

base/BUILD.gn

 # Copyright (c) 2013 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.
 
 # HOW TO WRITE CONDITIONALS IN THIS FILE
 # ======================================
 #
 # In many other places, one would write a conditional that expresses all the
 # cases when a source file is used or unused, and then either add or subtract
 # it from the sources list in that case
@@ skipping 1871 matching lines @@
   if (is_android) {
     deps += [
       ":base_java",
       ":base_java_unittest_support",
       "//base/android/jni_generator:jni_generator_tests",
     ]
 
     # TODO(brettw) I think this should not be here, we should not be using
     # isolate files.
     isolate_file = "base_unittests.isolate"
+    data += [
+      isolate_file,
+      "base.isolate",

[Nico, 2016/03/11 21:07:47]

Why is this needed? GN doesn't use isolate files, instead it uses data sections
which get converted to isolate files during runhooks transparently. I kind of
expected we'd delete all the .isolate files once GN is used everywhere. This
seems to contradict that goal.

[Dirk Pranke, 2016/03/11 21:11:18]

See https://bugs.chromium.org/p/chromium/issues/detail?id=589318#c8

Android actually uses the .isolate files two different ways, unfortunately, and
GN/MB currently only addresses one of them. We will eventually need to fix the
android test scripts and/or MB to also address the other, but we need to do this
in the meantime to make swarming at least kinda work.

+      "//third_party/icu/icu.isolate",
+      "//third_party/instrumented_libraries/instrumented_libraries.isolate",
+      "//build/config/win/msvs_dependencies.isolate",
+    ]
   }
 
   if (is_ios) {
     sources -= [
       "files/file_locking_unittest.cc",
       "files/file_path_watcher_unittest.cc",
       "memory/discardable_shared_memory_unittest.cc",
       "memory/shared_memory_unittest.cc",
       "process/memory_unittest.cc",
       "process/process_unittest.cc",
@@ skipping 266 matching lines @@
 
   # GYP: //base.gyp:base_java_unittest_support
   android_library("base_java_unittest_support") {
     deps = [
       ":base_java",
     ]
     java_files =
         [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
   }
 }