| Index: site_scons/site_tools/library_deps.py
|
| diff --git a/site_scons/site_tools/library_deps.py b/site_scons/site_tools/library_deps.py
|
| index e7e7f0c8a1a5e141da0f994a5bfc133b9ff20a1b..2dc17c6f39c1f50bd0b6f11dd250567f5c7bf631 100644
|
| --- a/site_scons/site_tools/library_deps.py
|
| +++ b/site_scons/site_tools/library_deps.py
|
| @@ -45,6 +45,9 @@ LIBRARY_DEPENDENCIES_DEFAULT = {
|
| 'testrunner_browser': [
|
| 'ppapi',
|
| ],
|
| + 'arm_validator_core': [
|
| + 'cpu_features',
|
| + ],
|
| }
|
|
|
| # Untrusted only library dependencies.
|
| @@ -79,12 +82,14 @@ PLATFORM_LIBRARY_DEPENDENCIES = {
|
| ],
|
| 'ncvalidate_x86_32': [
|
| 'ncval_seg_sfi_x86_32',
|
| + 'cpu_features',
|
| ],
|
| 'ncval_base_verbose_x86_32': [
|
| 'ncval_base_x86_32',
|
| ],
|
| 'ncval_base_x86_32': [
|
| 'platform',
|
| + 'cpu_features',
|
| ],
|
| 'nc_opcode_modeling_verbose_x86_32': [
|
| 'nc_opcode_modeling_x86_32',
|
| @@ -137,12 +142,14 @@ PLATFORM_LIBRARY_DEPENDENCIES = {
|
| ],
|
| 'ncvalidate_x86_64': [
|
| 'ncval_reg_sfi_x86_64',
|
| + 'cpu_features',
|
| ],
|
| 'ncval_base_verbose_x86_64': [
|
| 'ncval_base_x86_64',
|
| ],
|
| 'ncval_base_x86_64': [
|
| 'platform',
|
| + 'cpu_features',
|
| ],
|
| 'nc_opcode_modeling_verbose_x86_64': [
|
| 'nc_opcode_modeling_x86_64',
|
| @@ -159,6 +166,7 @@ PLATFORM_LIBRARY_DEPENDENCIES = {
|
| 'nccopy_x86_64',
|
| 'ncval_base_x86_64',
|
| 'nc_decoder_x86_64',
|
| + 'cpu_features',
|
| ],
|
| 'ncval_seg_sfi_x86_64': [
|
| 'nccopy_x86_64',
|
| @@ -178,14 +186,10 @@ PLATFORM_LIBRARY_DEPENDENCIES = {
|
| 'ncvalidate_arm_v2',
|
| ],
|
| },
|
| - 'arm-thumb2': {
|
| - 'ncvalidate_arm_v2': [
|
| - 'arm_validator_core',
|
| - ],
|
| - },
|
| 'mips32': {
|
| 'ncvalidate_mips': [
|
| 'mips_validator_core',
|
| + 'cpu_features',
|
| ],
|
| 'validators': [
|
| 'ncvalidate_mips',
|
|
|