diff options
| author | Brett Wilson <brettw@chromium.org> | 2014-08-25 12:10:01 -0700 |
|---|---|---|
| committer | Brett Wilson <brettw@chromium.org> | 2014-08-25 19:11:32 +0000 |
| commit | 1c693998d75f78e94862c324afba3815356ecaf1 (patch) | |
| tree | e9eeb250ded43e757513a21fe3c92ada154c6b1b /remoting/remoting.gyp | |
| parent | 8fbaaa3b0cde0b4a96ef105814e76b3d9ab0d430 (diff) | |
| download | chromium_src-1c693998d75f78e94862c324afba3815356ecaf1.zip chromium_src-1c693998d75f78e94862c324afba3815356ecaf1.tar.gz chromium_src-1c693998d75f78e94862c324afba3815356ecaf1.tar.bz2 | |
Add some remoting targets to GN build.
Since GN runs its scripts in a different current directory than GYP, I had to update the remoting html template script to be able to handle this situation.
Also includes many misc linking fixes:
- Sets enable_nacl to false.
- Add renderer context menu component
- Adds many missing files
R=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/498773005
Cr-Commit-Position: refs/heads/master@{#291731}
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 80f89b8..fd9b11f 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -51,6 +51,7 @@ }], ], 'remoting_locales': [ + # Note: list duplicated in GN build. See //remoting/resources/BUILD.gn 'ar', 'bg', 'ca', 'cs', 'da', 'de', 'el', 'en', 'en-GB', 'es', 'es-419', 'et', 'fi', 'fil', 'fr', 'he', 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'lt', 'lv', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', @@ -149,6 +150,7 @@ }, # end of target 'remoting_breakpad' { + # GN version: //remoting/resources 'target_name': 'remoting_resources', 'type': 'none', 'dependencies': [ @@ -183,6 +185,7 @@ }, 'actions': [ { + # GN version: //remoting/resources:verify_resources 'action_name': 'verify_resources', 'inputs': [ 'resources/remoting_strings.grd', @@ -201,6 +204,7 @@ ], }, { + # GN version: //remoting/resources:strings 'action_name': 'remoting_strings', 'variables': { 'grit_grd_file': 'resources/remoting_strings.grd', @@ -208,6 +212,7 @@ 'includes': [ '../build/grit_action.gypi' ], }, { + # GN version: //remoting/resources:copy_locales 'action_name': 'copy_locales', 'variables': { 'copy_output_dir%': '<(PRODUCT_DIR)', @@ -232,6 +237,7 @@ }, # end of target 'remoting_resources' { + # GN version: //remoting/base 'target_name': 'remoting_base', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -267,6 +273,7 @@ }, # end of target 'remoting_base' { + # GN version: //remoting/protocol 'target_name': 'remoting_protocol', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, |