| OLD | NEW |
| 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 '../../../../../build/common.gypi', | 7 '../../../../../build/common.gypi', |
| 8 ], | 8 ], |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 'variables':{ | 10 'variables':{ |
| 11 'target_base': 'none', | 11 'target_base': 'none', |
| 12 }, | 12 }, |
| 13 'target_conditions': [ | 13 'target_conditions': [ |
| 14 ['target_base=="srt_x86_cmn"', { | 14 ['target_base=="srt_x86_cmn"', { |
| 15 'sources': [ | 15 'sources': [ |
| 16 'nacl_ldt_x86.c', | 16 'nacl_ldt_x86.c', |
| 17 ], | 17 ], |
| 18 'include_dirs': [ | 18 'include_dirs': [ |
| 19 '<(INTERMEDIATE_DIR)', | 19 '<(INTERMEDIATE_DIR)', |
| 20 '<(SHARED_INTERMEDIATE_DIR)', | 20 '<(SHARED_INTERMEDIATE_DIR)', |
| 21 ], | 21 ], |
| 22 }], | 22 }], |
| 23 ], | 23 ], |
| 24 }, | 24 }, |
| 25 # For standalone binaries (nacl_standalone=1) we link validator_ragel in |
| 26 # addition to the main validator for testing. For Chromium we avoid this |
| 27 # dependency to keep download size to a minimum. TODO(pasko): eliminate the |
| 28 # difference when validator_ragel is proven to allow a subset of what the |
| 29 # current validator allows. |
| 25 'targets': [ | 30 'targets': [ |
| 26 { | 31 { |
| 27 'target_name': 'service_runtime_x86_common', | 32 'target_name': 'service_runtime_x86_common', |
| 28 'type': 'static_library', | 33 'type': 'static_library', |
| 29 'variables': { | 34 'variables': { |
| 30 'target_base': 'srt_x86_cmn', | 35 'target_base': 'srt_x86_cmn', |
| 31 }, | 36 }, |
| 32 'include_dirs': [ | 37 'include_dirs': [ |
| 33 '<(SHARED_INTERMEDIATE_DIR)', | 38 '<(SHARED_INTERMEDIATE_DIR)', |
| 34 ], | 39 ], |
| 35 'conditions': [ | 40 'conditions': [ |
| 36 ['target_arch=="ia32"', { | 41 ['target_arch=="ia32"', { |
| 37 'dependencies': [ | 42 'dependencies': [ |
| 38 '<(DEPTH)/native_client/src/trusted/validator/x86/32/validator_x86_3
2.gyp:ncvalidate_x86_32', | 43 '<(DEPTH)/native_client/src/trusted/validator/x86/32/validator_x86_3
2.gyp:ncvalidate_x86_32', |
| 44 ], |
| 45 }], |
| 46 ['nacl_standalone==1 and target_arch=="ia32"', { |
| 47 'dependencies': [ |
| 39 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8
6_32.gyp:dfa_validate_x86_32', | 48 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8
6_32.gyp:dfa_validate_x86_32', |
| 40 ], | 49 ], |
| 41 }], | 50 }], |
| 42 ['OS!="win" and target_arch=="x64"', { | 51 ['OS!="win" and target_arch=="x64"', { |
| 43 'dependencies': [ | 52 'dependencies': [ |
| 44 '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_6
4.gyp:ncvalidate_x86_64', | 53 '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_6
4.gyp:ncvalidate_x86_64', |
| 54 ], |
| 55 }], |
| 56 ['nacl_standalone==1 and OS!="win" and target_arch=="x64"', { |
| 57 'dependencies': [ |
| 45 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8
6_64.gyp:dfa_validate_x86_64', | 58 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8
6_64.gyp:dfa_validate_x86_64', |
| 46 ], | 59 ], |
| 47 }], | 60 }], |
| 48 ], | 61 ], |
| 49 }, | 62 }, |
| 50 ], | 63 ], |
| 51 'conditions': [ | 64 'conditions': [ |
| 52 ['OS=="win"', { | 65 ['OS=="win"', { |
| 53 'targets': [ | 66 'targets': [ |
| 54 { | 67 { |
| 55 'target_name': 'service_runtime_x86_common64', | 68 'target_name': 'service_runtime_x86_common64', |
| 56 'type': 'static_library', | 69 'type': 'static_library', |
| 57 'variables': { | 70 'variables': { |
| 58 'target_base': 'srt_x86_cmn', | 71 'target_base': 'srt_x86_cmn', |
| 59 'win_target': 'x64', | 72 'win_target': 'x64', |
| 60 }, | 73 }, |
| 61 'dependencies': [ | 74 'dependencies': [ |
| 62 '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_6
4.gyp:ncvalidate_x86_64', | 75 '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_6
4.gyp:ncvalidate_x86_64', |
| 63 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8
6_64.gyp:dfa_validate_x86_64', | 76 ], |
| 77 'conditions': [ |
| 78 ['nacl_standalone==1', { |
| 79 'dependencies': [ |
| 80 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validato
r_x86_64.gyp:dfa_validate_x86_64', |
| 81 ], |
| 82 }], |
| 64 ], | 83 ], |
| 65 }, | 84 }, |
| 66 ], | 85 ], |
| 67 }], | 86 }], |
| 68 ], | 87 ], |
| 69 } | 88 } |
| OLD | NEW |