Add support for component=shared_library for base_unittests_run.

Specifically, this adds support to run base_unittests isolated
via 'isolate.py run' when built with component build.

This requires rolling icu @ 246118 to get the new icu.isolate.

R=thakis@chromium.org,jshin@chromium.org,frankf@chromium.org,rsleevi@chromium.org
BUG=336439

Review URL: https://codereview.chromium.org/132233030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246247 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 86 insertions, 10 deletions

diff --git a/DEPS b/DEPS
index b1ce441..9bd8636 100644
--- a/DEPS
+++ b/DEPS
@@ -98,7 +98,7 @@ deps = {
     "/external/w3c/csswg-test.git@8c415e3215a203fa3a22dbdd1799279fdf44c81e",
 
   "src/third_party/icu":
-    "/trunk/deps/third_party/icu46@244134",
+    "/trunk/deps/third_party/icu46@246118",
 
   "src/third_party/libexif/sources":
     "/trunk/deps/third_party/libexif/sources@146817",
diff --git a/base/base.isolate b/base/base.isolate
new file mode 100644
index 0000000..c92a14b
--- /dev/null
+++ b/base/base.isolate
@@ -0,0 +1,38 @@
+# 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.
+{
+  'conditions': [
+    ['OS=="linux" and component=="shared_library"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/lib/libbase.so',
+          '<(PRODUCT_DIR)/lib/libbase_i18n.so',
+          '<(PRODUCT_DIR)/lib/libbase_prefs.so',
+        ],
+      },
+    }],
+    ['OS=="mac" and component=="shared_library"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/libbase.dylib',
+          '<(PRODUCT_DIR)/libbase_i18n.dylib',
+          '<(PRODUCT_DIR)/libbase_prefs.dylib',
+        ],
+      },
+    }],
+    ['OS=="win" and component=="shared_library"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/base.dll',
+          '<(PRODUCT_DIR)/base_i18n.dll',
+          '<(PRODUCT_DIR)/base_prefs.dll',
+        ],
+      },
+    }],
+  ],
+  'includes': [
+    '../build/linux/system.isolate',
+    '../third_party/icu/icu.isolate',
+  ],
+}
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate
index 3f8f504..e9df795 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -56,6 +56,6 @@
     }],
   ],
   'includes': [
-    '../third_party/icu/icu.isolate',
+    'base.isolate',
   ],
 }
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
index 6ea06fc..8c81497 100644
--- a/build/android/pylib/gtest/setup.py
+++ b/build/android/pylib/gtest/setup.py
@@ -115,10 +115,14 @@ def _GenerateDepsDirUsingIsolate(suite_name):
       'remap',
       '--isolate', isolate_abs_path,
       '--isolated', isolated_abs_path,
+      '--outdir', constants.ISOLATE_DEPS_DIR,
+
       '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(),
+
       '--config-variable', 'OS', 'android',
+      '--config-variable', 'component', 'static_library',
       '--config-variable', 'icu_use_data_file_flag', '0',
-      '--outdir', constants.ISOLATE_DEPS_DIR,
+      '--config-variable', 'use_openssl', '0',
   ]
   assert not cmd_helper.RunCmd(isolate_cmd)
 
diff --git a/build/isolate.gypi b/build/isolate.gypi
index 3d23655..b038a3f 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -69,20 +69,32 @@
         'python',
         '<(DEPTH)/tools/swarming_client/isolate.py',
         '<(test_isolation_mode)',
+        '--result', '<@(_outputs)',
+        '--isolate', '<(RULE_INPUT_PATH)',
+
         # Variables should use the -V FOO=<(FOO) form so frequent values,
-        # like '0' or '1', aren't stripped out by GYP.
-	# This list needs to be kept in sync with the cmd line options
-	# in src/build/android/pylib/gtest/setup.py.
+        # like '0' or '1', aren't stripped out by GYP. Run 'isolate.py help' for
+        # more details.
+        #
+        # This list needs to be kept in sync with the cmd line options
+        # in src/build/android/pylib/gtest/setup.py.
+
+        # Path variables are used to replace file paths when loading a .isolate
+        # file
         '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
+
+        # Extra variables are replaced on the 'command' entry and on paths in
+        # the .isolate file but are not considered relative paths.
+        '--extra-variable', 'version_full=<(version_full)',
+
         '--config-variable', 'OS=<(OS)',
+        '--config-variable', 'component=<(component)',
         # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run
         # once support for user-defined config variables is added.
         '--config-variable',
-        'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',
+          'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',
         '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
-        '--extra-variable', 'version_full=<(version_full)',
-        '--result', '<@(_outputs)',
-        '--isolate', '<(RULE_INPUT_PATH)',
+        '--config-variable', 'use_openssl=<(use_openssl)',
       ],
       'conditions': [
         # Note: When gyp merges lists, it appends them to the old value.
diff --git a/build/linux/system.isolate b/build/linux/system.isolate
new file mode 100644
index 0000000..79fa36b
--- /dev/null
+++ b/build/linux/system.isolate
@@ -0,0 +1,8 @@
+# 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.
+{
+  'includes': [
+    '../../net/third_party/nss/ssl.isolate',
+  ],
+}
diff --git a/net/third_party/nss/ssl.isolate b/net/third_party/nss/ssl.isolate
new file mode 100644
index 0000000..db208ed
--- /dev/null
+++ b/net/third_party/nss/ssl.isolate
@@ -0,0 +1,14 @@
+# 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.
+{
+  'conditions': [
+    ['OS=="linux" and component=="shared_library" and use_openssl==0', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/lib/libcrssl.so',
+        ],
+      },
+    }],
+  ],
+}