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

Unified Diff: src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp

Issue 10174016: link with validator_ragel only in standalone binaries (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: indentation 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/trusted/service_runtime/sel_validate_image.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 08037d9536a3891dbc22244df3ca5a068e470c2c..c678618643b1e2c2c7fd59d3cf4774475c8aa9ba 100644
--- a/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
+++ b/src/trusted/service_runtime/arch/x86/service_runtime_x86.gyp
@@ -22,6 +22,11 @@
}],
],
},
+ # For standalone binaries (nacl_standalone=1) we link validator_ragel in
+ # addition to the main validator for testing. For Chromium we avoid this
+ # dependency to keep download size to a minimum. TODO(pasko): eliminate the
+ # difference when validator_ragel is proven to allow a subset of what the
+ # current validator allows.
'targets': [
{
'target_name': 'service_runtime_x86_common',
@@ -36,12 +41,20 @@
['target_arch=="ia32"', {
'dependencies': [
'<(DEPTH)/native_client/src/trusted/validator/x86/32/validator_x86_32.gyp:ncvalidate_x86_32',
+ ],
+ }],
+ ['nacl_standalone==1 and target_arch=="ia32"', {
+ 'dependencies': [
'<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_32.gyp:dfa_validate_x86_32',
],
}],
['OS!="win" and target_arch=="x64"', {
'dependencies': [
'<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_64.gyp:ncvalidate_x86_64',
+ ],
+ }],
+ ['nacl_standalone==1 and OS!="win" and target_arch=="x64"', {
+ 'dependencies': [
'<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_64.gyp:dfa_validate_x86_64',
],
}],
@@ -60,7 +73,13 @@
},
'dependencies': [
'<(DEPTH)/native_client/src/trusted/validator/x86/64/validator_x86_64.gyp:ncvalidate_x86_64',
- '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_64.gyp:dfa_validate_x86_64',
+ ],
+ 'conditions': [
+ ['nacl_standalone==1', {
+ 'dependencies': [
+ '<(DEPTH)/native_client/src/trusted/validator_ragel/dfa_validator_x86_64.gyp:dfa_validate_x86_64',
+ ],
+ }],
],
},
],
« no previous file with comments | « no previous file | src/trusted/service_runtime/sel_validate_image.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698