Refactor the process of choosing validators.

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..3bfdb79b3cb987eef36ecf926123063a9b12c37c 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 chrome 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',
@@ -33,13 +38,23 @@
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'conditions': [
-        ['target_arch=="ia32"', {
+        ['nacl_standalone==0 and target_arch=="ia32"', {

[Nick Bray, 2012/04/25 20:57:42]

I think you should split the "standalone" change from the bigger refactoring. 
It's not necessary to squish them together.  The standalone change should be
done ASAP, the refactoring we can polish until it shines.

I hope you're using git, it makes splitting CLs less of a pain in the ass. :)

+          '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/x86/32/validator_x86_32.gyp:ncvalidate_x86_32',
             '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_32.gyp:dfa_validate_x86_32',
           ],
         }],
-        ['OS!="win" and target_arch=="x64"', {
+        ['nacl_standalone==0 and 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/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',
@@ -49,7 +64,22 @@
     },
   ],
   'conditions': [
-    ['OS=="win"', {
+    ['nacl_standalone==0 and OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'service_runtime_x86_common64',
+          'type': 'static_library',
+          'variables': {
+            'target_base': 'srt_x86_cmn',
+            'win_target': 'x64',
+          },
+          'dependencies': [
+            '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_64.gyp:ncvalidate_x86_64',
+          ],
+        },
+      ],
+    }],
+    ['nacl_standalone==1 and OS=="win"', {
       'targets': [
         {
           'target_name': 'service_runtime_x86_common64',