Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(496)

Side by Side Diff: src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp

Issue 10070010: validator_ragel: Link into TCB, use under env var (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: revert introducing extra empty line Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « site_scons/site_tools/library_deps.py ('k') | src/trusted/service_runtime/build.scons » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 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',
(...skipping 17 matching lines...) Expand all
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 ['target_arch=="ia32"', { 36 ['target_arch=="ia32"', {
37 'dependencies': [ 37 'dependencies': [
38 '<(DEPTH)/native_client/src/trusted/validator/x86/32/validator_x86_3 2.gyp:ncvalidate_x86_32', 38 '<(DEPTH)/native_client/src/trusted/validator/x86/32/validator_x86_3 2.gyp:ncvalidate_x86_32',
39 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8 6_32.gyp:dfa_validate_x86_32',
39 ], 40 ],
40 }], 41 }],
41 ['OS!="win" and target_arch=="x64"', { 42 ['OS!="win" and target_arch=="x64"', {
42 'dependencies': [ 43 'dependencies': [
43 '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_6 4.gyp:ncvalidate_x86_64', 44 '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_6 4.gyp:ncvalidate_x86_64',
45 '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x8 6_64.gyp:dfa_validate_x86_64',
44 ], 46 ],
45 }], 47 }],
46 ], 48 ],
47 }, 49 },
48 ], 50 ],
49 'conditions': [ 51 'conditions': [
50 ['OS=="win"', { 52 ['OS=="win"', {
51 'targets': [ 53 'targets': [
52 { 54 {
53 'target_name': 'service_runtime_x86_common64', 55 'target_name': 'service_runtime_x86_common64',
54 'type': 'static_library', 56 'type': 'static_library',
55 'variables': { 57 'variables': {
56 'target_base': 'srt_x86_cmn', 58 'target_base': 'srt_x86_cmn',
57 'win_target': 'x64', 59 'win_target': 'x64',
58 }, 60 },
59 'dependencies': [ 61 'dependencies': [
60 '<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_6 4.gyp:ncvalidate_x86_64', 62 '<(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',
61 ], 64 ],
62 }, 65 },
63 ], 66 ],
64 }], 67 }],
65 ], 68 ],
66 } 69 }
OLDNEW
« no previous file with comments | « site_scons/site_tools/library_deps.py ('k') | src/trusted/service_runtime/build.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698