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

Side by Side Diff: components/nacl.gyp

Issue 397243004: Pepper: Remove trusted plugin loadable module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: upload for recommit after chromite fix Created 6 years, 4 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
« no previous file with comments | « chrome/unit_tests.isolate ('k') | ppapi/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'nacl/nacl_defines.gypi', 10 'nacl/nacl_defines.gypi',
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 { 71 {
72 'target_name': 'nacl', 72 'target_name': 'nacl',
73 'type': 'static_library', 73 'type': 'static_library',
74 'variables': { 74 'variables': {
75 'nacl_target': 1, 75 'nacl_target': 1,
76 }, 76 },
77 'dependencies': [ 77 'dependencies': [
78 '../base/base.gyp:base', 78 '../base/base.gyp:base',
79 '../base/base.gyp:base_static', 79 '../base/base.gyp:base_static',
80 '../ipc/ipc.gyp:ipc', 80 '../ipc/ipc.gyp:ipc',
81 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome',
82 '../ppapi/ppapi_internal.gyp:ppapi_shared', 81 '../ppapi/ppapi_internal.gyp:ppapi_shared',
83 '../ppapi/ppapi_internal.gyp:ppapi_ipc', 82 '../ppapi/ppapi_internal.gyp:ppapi_ipc',
84 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l_main_chrome', 83 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l_main_chrome',
85 ], 84 ],
86 'conditions': [ 85 'conditions': [
87 ['disable_nacl_untrusted==0', { 86 ['disable_nacl_untrusted==0', {
88 'dependencies': [ 87 'dependencies': [
89 '../ppapi/native_client/native_client.gyp:nacl_irt', 88 '../ppapi/native_client/native_client.gyp:nacl_irt',
90 '../ppapi/native_client/src/untrusted/pnacl_support_extension/pn acl_support_extension.gyp:pnacl_support_extension', 89 '../ppapi/native_client/src/untrusted/pnacl_support_extension/pn acl_support_extension.gyp:pnacl_support_extension',
91 ], 90 ],
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 'nacl/renderer/progress_event.cc', 175 'nacl/renderer/progress_event.cc',
177 'nacl/renderer/progress_event.h', 176 'nacl/renderer/progress_event.h',
178 'nacl/renderer/trusted_plugin_channel.cc', 177 'nacl/renderer/trusted_plugin_channel.cc',
179 'nacl/renderer/trusted_plugin_channel.h', 178 'nacl/renderer/trusted_plugin_channel.h',
180 ], 179 ],
181 'include_dirs': [ 180 'include_dirs': [
182 '..', 181 '..',
183 ], 182 ],
184 'dependencies': [ 183 'dependencies': [
185 '../content/content.gyp:content_renderer', 184 '../content/content.gyp:content_renderer',
185 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_trusted_p lugin',
186 '../third_party/jsoncpp/jsoncpp.gyp:jsoncpp', 186 '../third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
187 '../third_party/WebKit/public/blink.gyp:blink', 187 '../third_party/WebKit/public/blink.gyp:blink',
188 ], 188 ],
189 'defines': [ 189 'defines': [
190 '<@(nacl_defines)', 190 '<@(nacl_defines)',
191 ], 191 ],
192 'direct_dependent_settings': { 192 'direct_dependent_settings': {
193 'defines': [ 193 'defines': [
194 '<@(nacl_defines)', 194 '<@(nacl_defines)',
195 ], 195 ],
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 ], 498 ],
499 'include_dirs': [ 499 'include_dirs': [
500 '..', 500 '..',
501 ], 501 ],
502 'dependencies': [ 502 'dependencies': [
503 '../content/content.gyp:content_common', 503 '../content/content.gyp:content_common',
504 ], 504 ],
505 }, 505 },
506 ] 506 ]
507 } 507 }
OLDNEW
« no previous file with comments | « chrome/unit_tests.isolate ('k') | ppapi/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698