diff options
| author | brettw <brettw@chromium.org> | 2015-03-04 09:24:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-04 17:25:38 +0000 |
| commit | 31f4de692fea12661a046a0fc8d091ff6f04654d (patch) | |
| tree | f5f607b3fda304a32c36bc1999fcefee8bf423df /remoting/remoting.gyp | |
| parent | 568f43629db2ee7c2121adf576c21e06554d5c2e (diff) | |
| download | chromium_src-31f4de692fea12661a046a0fc8d091ff6f04654d.zip chromium_src-31f4de692fea12661a046a0fc8d091ff6f04654d.tar.gz chromium_src-31f4de692fea12661a046a0fc8d091ff6f04654d.tar.bz2 | |
Add remoting and PPAPI tests to GN build
Reland of https://codereview.chromium.org/961323004
TBR=dpranke
Review URL: https://codereview.chromium.org/969173002
Cr-Commit-Position: refs/heads/master@{#319080}
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index a0da127..61e260b 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -20,9 +20,9 @@ # The IDs are not random to avoid rebuilding host when it's not # necessary. 'daemon_controller_clsid': - '<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'655bd819-c08c-4b04-80c2-f160739ff6ef\'), \'<(version_full)\')")', + '<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'<(daemon_controller_guid)\'), \'<(version_full)\')")', 'rdp_desktop_session_clsid': - '<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'6a7699f0-ee43-43e7-aa30-a6738f9bd470\'), \'<(version_full)\')")', + '<!(python -c "import uuid; print uuid.uuid5(uuid.UUID(\'<(rdp_desktop_session_guid)\'), \'<(version_full)\')")', }], ], }, @@ -188,7 +188,7 @@ }, # end of target 'remoting_resources' { - # GN version: //remoting/base + # GN version: //remoting/base and //remoting/codec 'target_name': 'remoting_base', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -220,6 +220,7 @@ 'hard_dependency': 1, 'sources': [ '<@(remoting_base_sources)', + '<@(remoting_codec_sources)', ], }, # end of target 'remoting_base' |