Refactor the process of choosing validators.

src/trusted/validator/build.scons

Index: src/trusted/validator/build.scons
diff --git a/src/trusted/validator/build.scons b/src/trusted/validator/build.scons
index 5da720bfce63a18c1b885c32d94edda34fe6655c..13039cac57c4a4fbd77c83bf2bb5bf51af03149a 100644
--- a/src/trusted/validator/build.scons
+++ b/src/trusted/validator/build.scons
@@ -1,5 +1,5 @@
 # -*- python -*-
-# Copyright (c) 2011 The Native Client Authors. All rights reserved.
+# Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -16,13 +16,14 @@ lib_env.Append(CPPPATH=['${TARGET_ROOT}'])
 lib_env.ComponentLibrary(lib_env.NaClTargetArchSuffix('ncfileutils'),
                          ['ncfileutil.c'])
 
+lib_env.ComponentLibrary('validators', ['validator_init.c'])
 
 if env.Bit('target_x86'):
   # TODO(ncbray) support ARM.  This will require making validation caching safe
   # for ARM and embedding ARM binary chunks in the test that can trigger various
   # validation scenarios.
   gtest_env = env.MakeGTestEnv()
-  validator_libs = [gtest_env.NaClTargetArchSuffix('ncvalidate')]
+  validator_libs = ['validators', gtest_env.NaClTargetArchSuffix('ncvalidate')]
 
   validation_cache_test_exe = gtest_env.ComponentProgram(
       'validation_cache_test',