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

Side by Side Diff: chrome/nacl.gypi

Issue 18098009: Move nacl_cmd_line to components/nacl/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 7 years, 5 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'include': [ 6 'include': [
7 '../native_client/build/untrusted.gypi', 7 '../native_client/build/untrusted.gypi',
8 ], 8 ],
9 'target_defaults': { 9 'target_defaults': {
10 'variables': { 10 'variables': {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 { 101 {
102 'target_name': 'nacl_win64', 102 'target_name': 'nacl_win64',
103 'type': 'static_library', 103 'type': 'static_library',
104 'variables': { 104 'variables': {
105 'nacl_target': 1, 105 'nacl_target': 1,
106 }, 106 },
107 'dependencies': [ 107 'dependencies': [
108 '../native_client/src/trusted/service_runtime/service_runtime.gy p:sel_main_chrome64', 108 '../native_client/src/trusted/service_runtime/service_runtime.gy p:sel_main_chrome64',
109 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64', 109 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64',
110 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64', 110 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
111 '../components/nacl_common.gyp:nacl_common_win64',
111 ], 112 ],
112 'export_dependent_settings': [ 113 'export_dependent_settings': [
113 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64', 114 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
114 ], 115 ],
115 'sources': [ 116 'sources': [
116 'common/nacl_cmd_line.cc',
117 'common/nacl_debug_exception_handler_win.cc', 117 'common/nacl_debug_exception_handler_win.cc',
118 'common/nacl_messages.cc', 118 'common/nacl_messages.cc',
119 'common/nacl_types.cc', 119 'common/nacl_types.cc',
120 'nacl/nacl_broker_listener.cc', 120 'nacl/nacl_broker_listener.cc',
121 'nacl/nacl_broker_listener.h', 121 'nacl/nacl_broker_listener.h',
122 '../components/nacl/common/nacl_cmd_line.cc',
122 ], 123 ],
123 'include_dirs': [ 124 'include_dirs': [
124 '..', 125 '..',
125 ], 126 ],
126 'defines': [ 127 'defines': [
127 '<@(nacl_win64_defines)', 128 '<@(nacl_win64_defines)',
128 'COMPILE_CONTENT_STATICALLY', 129 'COMPILE_CONTENT_STATICALLY',
129 ], 130 ],
130 'configurations': { 131 'configurations': {
131 'Common_Base': { 132 'Common_Base': {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 'target_name': 'nacl_win64', 210 'target_name': 'nacl_win64',
210 'type': 'none', 211 'type': 'none',
211 'sources': [], 212 'sources': [],
212 }, 213 },
213 ], 214 ],
214 }], 215 }],
215 ], 216 ],
216 }], 217 }],
217 ], 218 ],
218 } 219 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698