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

Side by Side Diff: components/nacl.gyp

Issue 1053313002: Revert of Init Mojo embedder for Windows NaCl plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | components/nacl/loader/nacl_helper_linux.cc » ('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 'target_defaults': { 9 'target_defaults': {
10 'variables': { 10 'variables': {
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 'type': 'executable', 220 'type': 'executable',
221 'include_dirs': [ 221 'include_dirs': [
222 '..', 222 '..',
223 ], 223 ],
224 'sources': [ 224 'sources': [
225 'nacl/loader/nacl_helper_linux.cc', 225 'nacl/loader/nacl_helper_linux.cc',
226 'nacl/loader/nacl_helper_linux.h', 226 'nacl/loader/nacl_helper_linux.h',
227 ], 227 ],
228 'dependencies': [ 228 'dependencies': [
229 'nacl_linux', 229 'nacl_linux',
230 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
231 ], 230 ],
232 'cflags': ['-fPIE'], 231 'cflags': ['-fPIE'],
233 'ldflags!': [ 232 'ldflags!': [
234 # Do not pick the default ASan options from 233 # Do not pick the default ASan options from
235 # build/sanitizers/sanitizer_options.cc to avoid a conflict with 234 # build/sanitizers/sanitizer_options.cc to avoid a conflict with
236 # those in nacl/nacl_helper_linux.cc. 235 # those in nacl/nacl_helper_linux.cc.
237 '-Wl,-u_sanitizer_options_link_helper', 236 '-Wl,-u_sanitizer_options_link_helper',
238 ], 237 ],
239 'link_settings': { 238 'link_settings': {
240 'ldflags': ['-pie'], 239 'ldflags': ['-pie'],
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 ], 493 ],
495 'include_dirs': [ 494 'include_dirs': [
496 '..', 495 '..',
497 ], 496 ],
498 'dependencies': [ 497 'dependencies': [
499 '../content/content.gyp:content_common', 498 '../content/content.gyp:content_common',
500 ], 499 ],
501 }, 500 },
502 ] 501 ]
503 } 502 }
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | components/nacl/loader/nacl_helper_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698