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

Side by Side Diff: mojo/mojo_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 | « mojo/mojo_input_events_converters.gyp ('k') | mojo/mojo_nacl_untrusted.gyp » ('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 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 'conditions': [ 6 'conditions': [
7 ['disable_nacl==0 and disable_nacl_untrusted==0', { 7 ['disable_nacl==0 and disable_nacl_untrusted==0', {
8 'variables': { 8 'variables': {
9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui ld/inverse_depth.py <(DEPTH))/monacl', 9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui ld/inverse_depth.py <(DEPTH))/monacl',
10 }, 10 },
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 'defines': [ 43 'defines': [
44 '<@(nacl_defines)', 44 '<@(nacl_defines)',
45 ], 45 ],
46 'include_dirs': [ 46 'include_dirs': [
47 '..', 47 '..',
48 ], 48 ],
49 'sources': [ 49 'sources': [
50 '<(monacl_codegen_dir)/mojo_syscall.cc', 50 '<(monacl_codegen_dir)/mojo_syscall.cc',
51 ], 51 ],
52 'dependencies': [ 52 'dependencies': [
53 'mojo_public.gyp:mojo_system_placeholder', 53 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
54 ], 54 ],
55 }, 55 },
56 { 56 {
57 'target_name': 'monacl_sel', 57 'target_name': 'monacl_sel',
58 'type': 'static_library', 58 'type': 'static_library',
59 'defines': [ 59 'defines': [
60 '<@(nacl_defines)', 60 '<@(nacl_defines)',
61 ], 61 ],
62 'include_dirs': [ 62 'include_dirs': [
63 '..', 63 '..',
64 ], 64 ],
65 'sources': [ 65 'sources': [
66 'nacl/monacl_sel_main.cc', 66 'nacl/monacl_sel_main.cc',
67 ], 67 ],
68 'dependencies': [ 68 'dependencies': [
69 '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime. gyp:sel', 69 '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime. gyp:sel',
70 'monacl_codegen', 70 'monacl_codegen',
71 'monacl_syscall', 71 'monacl_syscall',
72 ], 72 ],
73 }, 73 },
74 { 74 {
75 'target_name': 'monacl_shell', 75 'target_name': 'monacl_shell',
76 'type': 'executable', 76 'type': 'executable',
77 'dependencies': [ 77 'dependencies': [
78 '../base/base.gyp:base', 78 '../base/base.gyp:base',
79 'mojo_edk.gyp:mojo_system_impl', 79 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
80 'monacl_sel', 80 'monacl_sel',
81 ], 81 ],
82 'sources': [ 82 'sources': [
83 'nacl/monacl_shell.cc', 83 'nacl/monacl_shell.cc',
84 ], 84 ],
85 }, 85 },
86 ], 86 ],
87 'conditions': [ 87 'conditions': [
88 ['OS=="win" and target_arch=="ia32"', { 88 ['OS=="win" and target_arch=="ia32"', {
89 'targets': [ 89 'targets': [
90 { 90 {
91 'target_name': 'monacl_syscall_win64', 91 'target_name': 'monacl_syscall_win64',
92 'type': 'static_library', 92 'type': 'static_library',
93 'defines': [ 93 'defines': [
94 '<@(nacl_defines)', 94 '<@(nacl_defines)',
95 ], 95 ],
96 'include_dirs': [ 96 'include_dirs': [
97 '..', 97 '..',
98 ], 98 ],
99 'sources': [ 99 'sources': [
100 '<(monacl_codegen_dir)/mojo_syscall.cc', 100 '<(monacl_codegen_dir)/mojo_syscall.cc',
101 ], 101 ],
102 'dependencies': [ 102 'dependencies': [
103 'mojo_public.gyp:mojo_system_placeholder', 103 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
104 ], 104 ],
105 'configurations': { 105 'configurations': {
106 'Common_Base': { 106 'Common_Base': {
107 'msvs_target_platform': 'x64', 107 'msvs_target_platform': 'x64',
108 } 108 }
109 }, 109 },
110 }, 110 },
111 ], 111 ],
112 }], 112 }],
113 ], 113 ],
114 }], 114 }],
115 ], 115 ],
116 } 116 }
OLDNEW
« no previous file with comments | « mojo/mojo_input_events_converters.gyp ('k') | mojo/mojo_nacl_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698