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: http://src.chromium.org/svn/trunk/src/build@246247 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/pylib/gtest/setup.py

@@ -115,10 +115,14 @@ def _GenerateDepsDirUsingIsolate(suite_name):
       'remap',
       '--isolate', isolate_abs_path,
       '--isolated', isolated_abs_path,
-      '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(),
-      '--config-variable', 'OS', 'android',
-      '--config-variable', 'icu_use_data_file_flag', '0',
       '--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',
+      '--config-variable', 'use_openssl', '0',
   ]
   assert not cmd_helper.RunCmd(isolate_cmd)
 

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.

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',
+  ],
+}