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':{ |
(...skipping 15 matching lines...) Expand all Loading... | |
26 { | 26 { |
27 'target_name': 'service_runtime_x86_common', | 27 'target_name': 'service_runtime_x86_common', |
28 'type': 'static_library', | 28 'type': 'static_library', |
29 'variables': { | 29 'variables': { |
30 'target_base': 'srt_x86_cmn', | 30 'target_base': 'srt_x86_cmn', |
31 }, | 31 }, |
32 'include_dirs': [ | 32 'include_dirs': [ |
33 '<(SHARED_INTERMEDIATE_DIR)', | 33 '<(SHARED_INTERMEDIATE_DIR)', |
34 ], | 34 ], |
35 'conditions': [ | 35 'conditions': [ |
36 ['nacl_validator_ragel==0 and target_arch=="ia32"', { | 36 ['target_arch=="ia32"', { |
37 'dependencies': [ | |
38 '<(DEPTH)/native_client/src/trusted/validator/x86/32/validator_x86_3 2.gyp:ncvalidate_x86_32', | |
39 ], | |
40 }], | |
41 ['nacl_validator_ragel!=0 and target_arch=="ia32"', { | |
42 'dependencies': [ | 37 'dependencies': [ |
43 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8 6_32.gyp:dfa_validate_x86_32', | 38 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8 6_32.gyp:dfa_validate_x86_32', |
44 ], | 39 ], |
45 }], | 40 }], |
46 ['nacl_validator_ragel==0 and target_arch=="x64"', { | 41 ['target_arch=="x64"', { |
47 'dependencies': [ | |
48 '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_6 4.gyp:ncvalidate_x86_64', | |
49 ], | |
50 }], | |
51 ['nacl_validator_ragel!=0 and target_arch=="x64"', { | |
52 'dependencies': [ | 42 'dependencies': [ |
53 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8 6_64.gyp:dfa_validate_x86_64', | 43 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8 6_64.gyp:dfa_validate_x86_64', |
54 ], | 44 ], |
55 }], | 45 }], |
56 ], | 46 ], |
57 }, | 47 }, |
58 ], | 48 ], |
59 'conditions': [ | 49 'conditions': [ |
60 ['OS=="win" and target_arch=="ia32"', { | 50 ['OS=="win" and target_arch=="ia32"', { |
61 'targets': [ | 51 'targets': [ |
62 { | 52 { |
63 'target_name': 'service_runtime_x86_common64', | 53 'target_name': 'service_runtime_x86_common64', |
64 'type': 'static_library', | 54 'type': 'static_library', |
65 'variables': { | 55 'variables': { |
66 'target_base': 'srt_x86_cmn', | 56 'target_base': 'srt_x86_cmn', |
67 'win_target': 'x64', | 57 'win_target': 'x64', |
68 }, | 58 }, |
69 'conditions': [ | 59 'dependencies': [ |
70 ['nacl_validator_ragel==0', { | 60 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8 6_64.gyp:dfa_validate_x86_64', |
71 'dependencies': [ | 61 ], |
Mark Seaborn
2014/10/07 21:53:46
Nit: fix indentation here
shyamsundarr
2014/10/08 19:59:03
Done.
| |
72 '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x 86_64.gyp:ncvalidate_x86_64', | 62 |
73 ], | |
74 }], | |
75 ['nacl_validator_ragel!=0', { | |
76 'dependencies': [ | |
77 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validato r_x86_64.gyp:dfa_validate_x86_64', | |
78 ], | |
79 }], | |
80 ], | |
81 }, | 63 }, |
82 ], | 64 ], |
83 }], | 65 }], |
84 ], | 66 ], |
85 } | 67 } |
OLD | NEW |