link with validator_ragel only in standalone binaries

src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp

Index: src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
diff --git a/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp b/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
index 08037d9536a3891dbc22244df3ca5a068e470c2c..3250d33cbb012160c203e3616af1a4c8684db26c 100644
--- a/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
+++ b/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
@@ -22,6 +22,11 @@
       }],
     ],
   },
+  # For standalone binaries (nacl_standalone=1) we link validator_ragel in
+  # addition to the main validator for testing. For Chromium we avoid this
+  # dependency to keep download size to a minimum. TODO(pasko): eliminate the
+  # difference when validator_ragel is proven to allow a subset of what the
+  # current validator allows.
   'targets': [
     {
       'target_name': 'service_runtime_x86_common',
@@ -36,12 +41,20 @@
         ['target_arch=="ia32"', {
           'dependencies': [
             '<(DEPTH)/native_client/src/trusted/validator/x86/32/validator_x86_32.gyp:ncvalidate_x86_32',
+          ],
+        }],
+        ['nacl_standalone==1 and target_arch=="ia32"', {
+          'dependencies': [
             '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_32.gyp:dfa_validate_x86_32',
           ],
         }],
         ['OS!="win" and target_arch=="x64"', {
           'dependencies': [
             '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_64.gyp:ncvalidate_x86_64',
+          ],
+        }],
+        ['nacl_standalone==1 and OS!="win" and target_arch=="x64"', {
+          'dependencies': [
             '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_64.gyp:dfa_validate_x86_64',
           ],
         }],
@@ -60,7 +73,13 @@
           },
           'dependencies': [
             '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_64.gyp:ncvalidate_x86_64',
-            '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_64.gyp:dfa_validate_x86_64',
+          ],
+          'conditions': [
+            ['nacl_standalone==1', {
+              'dependencies': [
+                '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_64.gyp:dfa_validate_x86_64',
+                ],

[Mark Seaborn, 2012/04/26 15:10:54]

Indent -2

+            }],
           ],
         },
       ],