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

Side by Side Diff: trunk/src/remoting/remoting_client.gypi

Issue 254243002: Revert 267030 "Build remoting for PNaCl" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'remoting_client_plugin', 8 'target_name': 'remoting_client_plugin',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 ], 91 ],
92 }, # end of target 'remoting_webapp_html' 92 }, # end of target 'remoting_webapp_html'
93 93
94 { 94 {
95 'target_name': 'remoting_webapp', 95 'target_name': 'remoting_webapp',
96 'type': 'none', 96 'type': 'none',
97 'dependencies': [ 97 'dependencies': [
98 'remoting_webapp_v1', 98 'remoting_webapp_v1',
99 'remoting_webapp_v2', 99 'remoting_webapp_v2',
100 ], 100 ],
101 'conditions': [
102 ['disable_nacl==0 and disable_nacl_untrusted==0', {
103 'dependencies': [
104 'remoting_webapp_pnacl',
105 ],
106 }],
107 ],
108 }, # end of target 'remoting_webapp' 101 }, # end of target 'remoting_webapp'
109 102
110 { 103 {
111 'target_name': 'remoting_webapp_v1', 104 'target_name': 'remoting_webapp_v1',
112 'type': 'none', 105 'type': 'none',
113 'variables': { 106 'variables': {
114 'webapp_type': 'v1', 107 'webapp_type': 'v1',
115 'include_host_plugin': '<(enable_remoting_host)', 108 'include_host_plugin': '<(enable_remoting_host)',
116 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp', 109 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
117 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip', 110 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
118 }, 111 },
119 'includes': [ 'remoting_webapp.gypi', ], 112 'includes': [ 'remoting_webapp.gypi', ],
120 }, # end of target 'remoting_webapp_v1' 113 }, # end of target 'remoting_webapp_v1'
121 114
122 { 115 {
123 'target_name': 'remoting_webapp_v2', 116 'target_name': 'remoting_webapp_v2',
124 'type': 'none', 117 'type': 'none',
125 'variables': { 118 'variables': {
126 'webapp_type': 'v2', 119 'webapp_type': 'v2',
127 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2', 120 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
128 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip', 121 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
129 'extra_files': [ 'webapp/background.js' ], 122 'extra_files': [ 'webapp/background.js' ],
130 }, 123 },
131 'includes': [ 'remoting_webapp.gypi', ], 124 'includes': [ 'remoting_webapp.gypi', ],
132 }, # end of target 'remoting_webapp_v2' 125 }, # end of target 'remoting_webapp_v2'
133 ], # end of targets 126 ], # end of targets
134
135 'conditions': [
136 ['disable_nacl==0 and disable_nacl_untrusted==0', {
137 'targets': [
138 {
139 'target_name': 'remoting_webapp_pnacl',
140 'type': 'none',
141 'variables': {
142 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.pnacl',
143 'zip_path': '<(PRODUCT_DIR)/remoting-webapp-pnacl.zip',
144 'extra_files': [ 'webapp/background.js' ],
145 'webapp_type': 'v2_pnacl',
146 },
147 'includes': [ 'remoting_webapp.gypi', ],
148 }, # end of target 'remoting_webapp_pnacl'
149 ],
150 }],
151 ],
152
153 } 127 }
OLDNEW
« no previous file with comments | « trunk/src/remoting/protocol/ssl_hmac_channel_authenticator.cc ('k') | trunk/src/remoting/remoting_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698