Scons: Remove duplication of VALIDATOR_LIBS list and use library_deps.py instead

site_scons/site_tools/library_deps.py

-# 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.
 
 """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.
 # Note: These are default rules that are used if platform specific rules are
 # not specified below in PLATFORM_LIBRARY_DEPENDENCIES.
@@ skipping 62 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': [
+            'ncvalidate_x86_32',
+            ],
         }),
     'x86-64': _AddDefaultLibraryDependencies({
         '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': [
@@ skipping 31 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': [
+            'ncvalidate_x86_64',
+            ],
         }),
     'arm': _AddDefaultLibraryDependencies({
         'ncvalidate_arm_v2': [
             'arm_validator_core',
             ],
+        'sel': [
+            'ncvalidate_arm_v2',
+            ],
         }),
     'arm-thumb2': _AddDefaultLibraryDependencies({
         'ncvalidate_arm_v2': [
             'arm_validator_core',
             ],
         }),
     }
 
 def AddLibDeps(platform, libraries):
   """ Adds dependent libraries to list of libraries.
@@ skipping 44 matching lines @@
           # dependencies have been added.
           to_visit.append(lib)
           for dep in dependencies[lib]:
             to_visit.append(dep)
           expanding.append(lib)
         else:
           # No dependent library, just add.
           closure.append(lib)
   closure.reverse()
   return closure