Make .isolate files easier to parse with json5.

R=maruel@chromium.org BUG= Review URL: https://codereview.chromium.org/1127423007 Cr-Commit-Position: refs/heads/master@{#329130}
marcosholgado · May 11, 2015 · d56309b · d56309b
1 parent af08f18
commit d56309b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
@@ -123,16 +123,14 @@
         ],
       },
     }],
-    [('disable_nacl==0 and (OS=="linux" or OS=="mac" or OS=="win") and '
-         '(target_arch=="x64" or target_arch=="ia32")'), {
+    ['disable_nacl==0 and (OS=="linux" or OS=="mac" or OS=="win") and (target_arch=="x64" or target_arch=="ia32")', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf',
         ],
       },
     }],
-    [('disable_nacl==0 and OS=="linux" and '
-      '(target_arch=="ia32" or target_arch=="x64" or target_arch=="arm")'), {
+    ['disable_nacl==0 and OS=="linux" and (target_arch=="ia32" or target_arch=="x64" or target_arch=="arm")', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_nonsfi.nmf',
@@ -148,8 +146,7 @@
         ],
       },
     }],
-    ['disable_nacl==0 and (OS=="win" or '
-         '((OS=="linux" or OS=="mac") and target_arch=="x64"))', {
+    ['disable_nacl==0 and (OS=="win" or ((OS=="linux" or OS=="mac") and target_arch=="x64"))', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/lib64/',
@@ -159,8 +156,7 @@
         ],
       },
     }],
-    ['disable_nacl==0 and target_arch=="ia32" and'
-         '(OS=="mac" or OS=="linux" or OS=="win")', {
+    ['disable_nacl==0 and target_arch=="ia32" and (OS=="mac" or OS=="linux" or OS=="win")', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/lib32/',
@@ -170,8 +166,7 @@
         ],
       },
     }],
-    ['disable_nacl==0 and OS=="linux" and '
-         '(target_arch=="x64" or target_arch=="ia32")', {
+    ['disable_nacl==0 and OS=="linux" and (target_arch=="x64" or target_arch=="ia32")', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32_nonsfi.nexe',

diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
@@ -19,8 +19,7 @@
         ]
       }
     }],
-    ['disable_nacl==0 and OS=="linux" and '
-         '(target_arch=="x64" or target_arch=="ia32" or target_arch=="arm")', {
+    ['disable_nacl==0 and OS=="linux" and (target_arch=="x64" or target_arch=="ia32" or target_arch=="arm")', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/nacl_helper_nonsfi<(EXECUTABLE_SUFFIX)',
@@ -48,8 +47,7 @@
         ],
       },
     }],
-    ['disable_nacl==0 and '
-         '(OS=="win" or (OS=="linux" and target_arch=="x64"))', {
+    ['disable_nacl==0 and (OS=="win" or (OS=="linux" and target_arch=="x64"))', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',