Move CPU features into its own static library.

src/trusted/platform_qualify/platform_qualify.gyp

Index: src/trusted/platform_qualify/platform_qualify.gyp
diff --git a/src/trusted/platform_qualify/platform_qualify.gyp b/src/trusted/platform_qualify/platform_qualify.gyp
index e49613937a4f456cdfab75e0c04972c2202ae57e..68e9981cb5c1716745878a8a9214bc33652c806b 100644
--- a/src/trusted/platform_qualify/platform_qualify.gyp
+++ b/src/trusted/platform_qualify/platform_qualify.gyp
@@ -1,4 +1,3 @@
-# -*- python -*-
 # 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.
@@ -78,18 +77,8 @@
       'variables': {
         'target_base': 'pqlib',
       },
-      # For nacl_cpuid used by nacl_cpuwhitelist.
-      'conditions': [
-        ['target_arch=="ia32"', {
-          'dependencies': [
-          '<(DEPTH)/native_client/src/trusted/validator/x86/validate_x86.gyp:ncval_base_x86_32',
-          ],
-        }],
-        ['target_arch=="x64"', {
-          'dependencies': [
-          '<(DEPTH)/native_client/src/trusted/validator/x86/validate_x86.gyp:ncval_base_x86_64',
-          ],
-        }],
+      'dependencies': [
+        '<(DEPTH)/native_client/src/trusted/cpu_features/cpu_features.gyp:cpu_features',
       ],
     },
   ],
@@ -104,8 +93,7 @@
             'win_target': 'x64',
           },
           'dependencies': [
-            # For nacl_cpuid used by nacl_cpuwhitelist.
-            '<(DEPTH)/native_client/src/trusted/validator/x86/validate_x86.gyp:ncval_base_x86_64',
+            '<(DEPTH)/native_client/src/trusted/cpu_features/cpu_features.gyp:cpu_features64',
           ],
         },
       ],