Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / build / isolate.gypi

diff --git a/src/build/isolate.gypi b/src/build/isolate.gypi
index b598066..c9a15ad 100644 (file)
--- a/src/build/isolate.gypi
+++ b/src/build/isolate.gypi
@@ -88,12 +88,14 @@
         '--extra-variable', 'version_full=<(version_full)',
 
         '--config-variable', 'OS=<(OS)',
+        '--config-variable', 'chromeos=<(chromeos)',
         '--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)',
         '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
+        '--config-variable', 'libpeer_target_type=<(libpeer_target_type)',
         '--config-variable', 'use_openssl=<(use_openssl)',
       ],
       'conditions': [
@@ -105,21 +107,12 @@
             '--extra-variable', 'mac_product_name', '<(mac_product_name)',
           ],
         }],
-        ["test_isolation_outdir==''", {
-          # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot
-          # be provided twice. To work around this behavior, append '/'.
-          #
-          # Also have a space after <(PRODUCT_DIR) or visual studio will
-          # escape the argument wrappping " with the \ and merge it into
-          # the following arguments.
-          'action': [ '--outdir', '<(PRODUCT_DIR)/ ' ],
-        }, {
-          'action': [ '--outdir', '<(test_isolation_outdir)' ],
+        ["test_isolation_outdir!=''", {
+          'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
         }],
         ['test_isolation_fail_on_missing == 0', {
-            'action': ['--ignore_broken_items'],
-          },
-        ],
+          'action': ['--ignore_broken_items'],
+        }],
       ],
     },
   ],