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

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

Issue 285243003: Revert 271343 "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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 ], 94 ],
95 }, # end of target 'remoting_webapp_html' 95 }, # end of target 'remoting_webapp_html'
96 96
97 { 97 {
98 'target_name': 'remoting_webapp', 98 'target_name': 'remoting_webapp',
99 'type': 'none', 99 'type': 'none',
100 'dependencies': [ 100 'dependencies': [
101 'remoting_webapp_v1', 101 'remoting_webapp_v1',
102 'remoting_webapp_v2', 102 'remoting_webapp_v2',
103 ], 103 ],
104 'conditions': [
105 ['disable_nacl==0 and disable_nacl_untrusted==0', {
106 'dependencies': [
107 'remoting_webapp_pnacl',
108 ],
109 }],
110 ],
111 }, # end of target 'remoting_webapp' 104 }, # end of target 'remoting_webapp'
112 105
113 { 106 {
114 'target_name': 'remoting_webapp_v1', 107 'target_name': 'remoting_webapp_v1',
115 'type': 'none', 108 'type': 'none',
116 'variables': { 109 'variables': {
117 'webapp_type': 'v1', 110 'webapp_type': 'v1',
118 'include_host_plugin': '<(enable_remoting_host)', 111 'include_host_plugin': '<(enable_remoting_host)',
119 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp', 112 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
120 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip', 113 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
121 }, 114 },
122 'includes': [ 'remoting_webapp.gypi', ], 115 'includes': [ 'remoting_webapp.gypi', ],
123 }, # end of target 'remoting_webapp_v1' 116 }, # end of target 'remoting_webapp_v1'
124 117
125 { 118 {
126 'target_name': 'remoting_webapp_v2', 119 'target_name': 'remoting_webapp_v2',
127 'type': 'none', 120 'type': 'none',
128 'variables': { 121 'variables': {
129 'webapp_type': 'v2', 122 'webapp_type': 'v2',
130 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2', 123 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
131 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip', 124 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
132 'extra_files': [ 'webapp/background.js' ], 125 'extra_files': [ 'webapp/background.js' ],
133 }, 126 },
134 'includes': [ 'remoting_webapp.gypi', ], 127 'includes': [ 'remoting_webapp.gypi', ],
135 }, # end of target 'remoting_webapp_v2' 128 }, # end of target 'remoting_webapp_v2'
136 ], # end of targets 129 ], # end of targets
137
138 'conditions': [
139 ['disable_nacl==0 and disable_nacl_untrusted==0', {
140 'targets': [
141 {
142 'target_name': 'remoting_webapp_pnacl',
143 'type': 'none',
144 'variables': {
145 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.pnacl',
146 'zip_path': '<(PRODUCT_DIR)/remoting-webapp-pnacl.zip',
147 'extra_files': [ 'webapp/background.js' ],
148 'webapp_type': 'v2_pnacl',
149 },
150 'includes': [ 'remoting_webapp.gypi', ],
151 }, # end of target 'remoting_webapp_pnacl'
152 ],
153 }],
154 ],
155
156 } 130 }
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