diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 22:49:20 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 22:49:20 +0000 |
| commit | a0c458629a0620ee65948645aa81c9a1dab43c55 (patch) | |
| tree | 25ae27f475deca585251897072c3638eca126ca4 /remoting/remoting_nacl.gyp | |
| parent | 703c6a8cbbfcc1d5d5b16e1c12e4a18497b4eb0f (diff) | |
| download | chromium_src-a0c458629a0620ee65948645aa81c9a1dab43c55.zip chromium_src-a0c458629a0620ee65948645aa81c9a1dab43c55.tar.gz chromium_src-a0c458629a0620ee65948645aa81c9a1dab43c55.tar.bz2 | |
Enable keyboard filters in PNaCl client
Previously keyboard filters were selected using the per-platform
filename exclusion rules, and that doesn't work for PNaCl plugin. Now
both Mac and ChromeOS filters are compiled into the PNaCl plugin and
selected in runtime.
BUG=276739
Review URL: https://codereview.chromium.org/292103004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting_nacl.gyp')
| -rw-r--r-- | remoting/remoting_nacl.gyp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp index cbfbef9..81dc8da 100644 --- a/remoting/remoting_nacl.gyp +++ b/remoting/remoting_nacl.gyp @@ -123,7 +123,18 @@ 'sources!': [ 'base/url_request_context.cc', 'jingle_glue/chromium_socket_factory.cc', - ] + ], + + # Include normalizing_input_filter_mac.cc excluded by the filename + # exclusion rules. Must be in target_conditions to make sure it's + # evaluated after the filename rules. + 'target_conditions': [ + ['1==1', { + 'sources/': [ + [ 'include', 'client/plugin/normalizing_input_filter_mac.cc' ], + ], + }], + ], }, # end of target 'remoting_client_plugin_lib_nacl' { |