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

Side by Side Diff: components/nacl.gyp

Issue 814543006: Move //mojo/{public, edk} underneath //third_party (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 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/BUILD.gn ('k') | content/app/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 '../mojo/mojo_edk.gyp:mojo_system_impl',
82 '../mojo/mojo_nacl.gyp:monacl_syscall', 81 '../mojo/mojo_nacl.gyp:monacl_syscall',
83 '../ppapi/ppapi_internal.gyp:ppapi_shared', 82 '../ppapi/ppapi_internal.gyp:ppapi_shared',
84 '../ppapi/ppapi_internal.gyp:ppapi_ipc', 83 '../ppapi/ppapi_internal.gyp:ppapi_ipc',
85 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l_main_chrome', 84 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l_main_chrome',
85 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
86 ], 86 ],
87 'conditions': [ 87 'conditions': [
88 ['disable_nacl_untrusted==0', { 88 ['disable_nacl_untrusted==0', {
89 'dependencies': [ 89 'dependencies': [
90 '../ppapi/native_client/native_client.gyp:nacl_irt', 90 '../ppapi/native_client/native_client.gyp:nacl_irt',
91 '../ppapi/native_client/src/untrusted/pnacl_support_extension/pn acl_support_extension.gyp:pnacl_support_extension', 91 '../ppapi/native_client/src/untrusted/pnacl_support_extension/pn acl_support_extension.gyp:pnacl_support_extension',
92 ], 92 ],
93 }], 93 }],
94 ], 94 ],
95 'direct_dependent_settings': { 95 'direct_dependent_settings': {
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 ['OS=="win" and target_arch=="ia32"', { 345 ['OS=="win" and target_arch=="ia32"', {
346 'targets': [ 346 'targets': [
347 { 347 {
348 'target_name': 'nacl_win64', 348 'target_name': 'nacl_win64',
349 'type': 'static_library', 349 'type': 'static_library',
350 'variables': { 350 'variables': {
351 'nacl_target': 1, 351 'nacl_target': 1,
352 }, 352 },
353 'dependencies': [ 353 'dependencies': [
354 'nacl_common_win64', 354 'nacl_common_win64',
355 '../mojo/mojo_edk.gyp:mojo_system_impl_win64',
356 '../mojo/mojo_nacl.gyp:monacl_syscall_win64', 355 '../mojo/mojo_nacl.gyp:monacl_syscall_win64',
357 '../native_client/src/trusted/service_runtime/service_runtime.gy p:sel_main_chrome64', 356 '../native_client/src/trusted/service_runtime/service_runtime.gy p:sel_main_chrome64',
358 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64', 357 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64',
359 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64', 358 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
359 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl_win64',
360 ], 360 ],
361 'export_dependent_settings': [ 361 'export_dependent_settings': [
362 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64', 362 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
363 ], 363 ],
364 'sources': [ 364 'sources': [
365 '../components/nacl/broker/nacl_broker_listener.cc', 365 '../components/nacl/broker/nacl_broker_listener.cc',
366 '../components/nacl/broker/nacl_broker_listener.h', 366 '../components/nacl/broker/nacl_broker_listener.h',
367 '../components/nacl/common/nacl_debug_exception_handler_win.cc', 367 '../components/nacl/common/nacl_debug_exception_handler_win.cc',
368 '../components/nacl/loader/nacl_helper_win_64.cc', 368 '../components/nacl/loader/nacl_helper_win_64.cc',
369 '../components/nacl/loader/nacl_helper_win_64.h', 369 '../components/nacl/loader/nacl_helper_win_64.h',
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 ], 516 ],
517 'include_dirs': [ 517 'include_dirs': [
518 '..', 518 '..',
519 ], 519 ],
520 'dependencies': [ 520 'dependencies': [
521 '../content/content.gyp:content_common', 521 '../content/content.gyp:content_common',
522 ], 522 ],
523 }, 523 },
524 ] 524 ]
525 } 525 }
OLDNEW
« no previous file with comments | « chrome/test/BUILD.gn ('k') | content/app/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698