diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 00:38:11 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 00:38:11 +0000 |
| commit | f164f48593d7c3d9ace978e00221e46423de1b65 (patch) | |
| tree | 66b5e89c4b736e5b1414436ba1cb68cab902bbfc /remoting/remoting.gyp | |
| parent | f4dafe029aab967bbc6ec5ad28c9f928280367f3 (diff) | |
| download | chromium_src-f164f48593d7c3d9ace978e00221e46423de1b65.zip chromium_src-f164f48593d7c3d9ace978e00221e46423de1b65.tar.gz chromium_src-f164f48593d7c3d9ace978e00221e46423de1b65.tar.bz2 | |
Reapply 53892 with ARM build fix as suggested by Kobic.
For some reason, the ARM g++ thinks that comparing a pointer to a class
method against NULL is using NULL for arithemtic. Switching to compare
against 0 makes this go away. TODO added to investigate what is going on.
Original Review URL: http://codereview.chromium.org/3064009
TBR: hclam@chromium.org
BUG=50248
TEST=reproed locally with CodeSourcery g++ and verified change fixed things.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 10dccf7..8b2dec6 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -78,6 +78,8 @@ 'sources': [ 'client/plugin/chromoting_plugin.cc', 'client/plugin/chromoting_plugin.h', + 'client/plugin/chromoting_scriptable_object.cc', + 'client/plugin/chromoting_scriptable_object.h', 'client/plugin/pepper_entrypoints.cc', 'client/plugin/pepper_entrypoints.h', 'client/plugin/pepper_input_handler.cc', |