Refactor the process of choosing validators.

site_scons/site_tools/library_deps.py

 # 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.
 
 """Simple harness for defining library dependencies for scons files."""
 
 
 # The following is a map from a library, to the corresponding
 # list of dependent libraries that must be included after that library, in
 # the list of libraries.
@@ skipping 10 matching lines @@
         'nrd_xfer',
         'nacl_perf_counter',
         'nacl_base',
         'imc',
         'container',
         'nacl_fault_inject',
         'nacl_interval',
         'platform',
         'platform_qual_lib',
         'gio',
+        'validators',
         ],
     }
 
 
 # Platform specific library dependencies. Mapping from a platform,
 # to a map from a library, to the corresponding list of dependendent
 # libraries that must be included after that library, in the list
 # of libraries.
 PLATFORM_LIBRARY_DEPENDENCIES = {
     'x86-32': {
         'nc_decoder_x86_32': [
             'ncval_base_x86_32',
             'nc_opcode_modeling_x86_32',
             ],
         'ncdis_util_x86_32': [
             'ncval_reg_sfi_verbose_x86_32',
             'ncdis_seg_sfi_verbose_x86_32',
+            'validators',
             ],
         'ncdis_seg_sfi_verbose_x86_32': [
             'ncdis_seg_sfi_x86_32',
             'ncval_base_verbose_x86_32',
             ],
         'ncvalidate_verbose_x86_32': [
             'ncvalidate_x86_32',
             'ncdis_seg_sfi_verbose_x86_32',
             ],
         'ncvalidate_x86_32': [
@@ skipping 22 matching lines @@
             'nc_decoder_x86_32',
             ],
         'ncval_seg_sfi_x86_32': [
             'nccopy_x86_32',
             'ncdis_seg_sfi_x86_32',
             'ncval_base_x86_32',
             # When turning on the DEBUGGING flag in the x86-32 validator
             # or decoder, add the following:
             #'nc_opcode_modeling_verbose_x86_32',
             ],
-        'sel': [
+        'validators': [
             'ncvalidate_x86_32',
             'dfa_validate_caller_x86_32',
             'dfa_validate_x86_32',
             ],
         },
     'x86-64': {
         'nc_decoder_x86_64': [
             'ncval_base_x86_64',
             'nc_opcode_modeling_x86_64',
             # When turning on the DEBUGGING flag in the x86-64 validator
             # or decoder, add the following:
             #'nc_opcode_modeling_verbose_x86_64',
             ],
         'ncdis_util_x86_64': [
             'ncval_reg_sfi_verbose_x86_64',
             'ncdis_seg_sfi_verbose_x86_64',
+            'validators',
             ],
         'ncdis_seg_sfi_verbose_x86_64': [
             'ncdis_seg_sfi_x86_64',
             'ncval_base_verbose_x86_64',
             ],
         'ncvalidate_verbose_x86_64': [
             'ncvalidate_x86_64',
             'ncval_reg_sfi_verbose_x86_64',
             ],
         'ncvalidate_x86_64': [
@@ skipping 19 matching lines @@
         'ncval_reg_sfi_x86_64': [
             'nccopy_x86_64',
             'ncval_base_x86_64',
             'nc_decoder_x86_64',
             ],
         'ncval_seg_sfi_x86_64': [
             'nccopy_x86_64',
             'ncdis_seg_sfi_x86_64',
             'ncval_base_x86_64',
             ],
-        'sel': [
+        'validators': [
             'ncvalidate_x86_64',
             'dfa_validate_caller_x86_64',
             'dfa_validate_x86_64',
             ],
         },
     'arm': {
         'ncvalidate_arm_v2': [
             'arm_validator_core',
             ],
-        'sel': [
+        'validators': [
             'ncvalidate_arm_v2',
             ],
         },
     'arm-thumb2': {
         'ncvalidate_arm_v2': [
             'arm_validator_core',
             ],
         },
     }
 
@@ skipping 28 matching lines @@
     closure.append(library)
 
   # Ideally we would just do "VisitList(libraries)" here, but some
   # PPAPI tests (specifically, tests/ppapi_gles_book) list "ppapi_cpp"
   # twice in the link line, and we need to maintain these duplicates.
   for library in reversed(libraries):
     VisitLibrary(library)
 
   closure.reverse()
   return closure