| Index: src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
|
| diff --git a/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp b/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
|
| index d75854dfef96a66b21739a05525119d354c6fcdb..181c85ed252b179bf3ff602ad7241db9b8c20c74 100644
|
| --- a/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
|
| +++ b/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
|
| @@ -33,22 +33,12 @@
|
| '<(SHARED_INTERMEDIATE_DIR)',
|
| ],
|
| 'conditions': [
|
| - ['nacl_validator_ragel==0 and target_arch=="ia32"', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/native_client/src/trusted/validator/x86/32/validator_x86_32.gyp:ncvalidate_x86_32',
|
| - ],
|
| - }],
|
| - ['nacl_validator_ragel!=0 and target_arch=="ia32"', {
|
| + ['target_arch=="ia32"', {
|
| 'dependencies': [
|
| '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_32.gyp:dfa_validate_x86_32',
|
| ],
|
| }],
|
| - ['nacl_validator_ragel==0 and target_arch=="x64"', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_64.gyp:ncvalidate_x86_64',
|
| - ],
|
| - }],
|
| - ['nacl_validator_ragel!=0 and target_arch=="x64"', {
|
| + ['target_arch=="x64"', {
|
| 'dependencies': [
|
| '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_64.gyp:dfa_validate_x86_64',
|
| ],
|
| @@ -66,17 +56,8 @@
|
| 'target_base': 'srt_x86_cmn',
|
| 'win_target': 'x64',
|
| },
|
| - 'conditions': [
|
| - ['nacl_validator_ragel==0', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_64.gyp:ncvalidate_x86_64',
|
| - ],
|
| - }],
|
| - ['nacl_validator_ragel!=0', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_64.gyp:dfa_validate_x86_64',
|
| - ],
|
| - }],
|
| + 'dependencies': [
|
| + '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_64.gyp:dfa_validate_x86_64',
|
| ],
|
| },
|
| ],
|
|
|