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

Side by Side Diff: ui/views/examples/examples.gyp

Issue 1836093004: Fix base dependency in views_examples_with_content_exe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix the fix Created 4 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 | « no previous file | no next file » | 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'targets': [ 8 'targets': [
9 { 9 {
10 # GN version: //ui/views/examples 10 # GN version: //ui/views/examples
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 'views_examples_with_content_export.h', 154 'views_examples_with_content_export.h',
155 'webview_example.cc', 155 'webview_example.cc',
156 'webview_example.h', 156 'webview_example.h',
157 ], 157 ],
158 }, # target_name: views_examples_with_content_lib 158 }, # target_name: views_examples_with_content_lib
159 { 159 {
160 # GN version: //ui/views/examples/views_examples_with_content_exe 160 # GN version: //ui/views/examples/views_examples_with_content_exe
161 'target_name': 'views_examples_with_content_exe', 161 'target_name': 'views_examples_with_content_exe',
162 'type': 'executable', 162 'type': 'executable',
163 'dependencies': [ 163 'dependencies': [
164 '../../../base/base.gyp:base',
165 '../../../content/content.gyp:content',
166 '../../views_content_client/views_content_client.gyp:views_content_clien t', 164 '../../views_content_client/views_content_client.gyp:views_content_clien t',
167 'views_examples_with_content_lib', 165 'views_examples_with_content_lib',
168 ], 166 ],
169 'sources': [ 167 'sources': [
170 # Note: sources list duplicated in GN build. 168 # Note: sources list duplicated in GN build.
171 'examples_with_content_main_exe.cc', 169 'examples_with_content_main_exe.cc',
172 ], 170 ],
173 'conditions': [ 171 'conditions': [
172 ['component=="shared_library"', {
173 'dependencies': [
174 '../../../base/base.gyp:base',
tfarina 2016/03/31 18:46:14 Are there other places where this is being doing l
Will Harris 2016/03/31 19:24:44 I agree it's quite mysterious, it doesn't happen i
tfarina 2016/03/31 19:53:43 I think gn does that only if the "library" is a so
175 '../../../content/content.gyp:content',
176 ],
177 }],
174 ['OS=="win"', { 178 ['OS=="win"', {
175 'link_settings': { 179 'link_settings': {
176 'libraries': [ 180 'libraries': [
177 '-limm32.lib', 181 '-limm32.lib',
178 '-loleacc.lib', 182 '-loleacc.lib',
179 ] 183 ]
180 }, 184 },
181 'msvs_settings': { 185 'msvs_settings': {
182 'VCManifestTool': { 186 'VCManifestTool': {
183 'AdditionalManifestFiles': [ 187 'AdditionalManifestFiles': [
184 'views_examples.exe.manifest', 188 'views_examples.exe.manifest',
185 ], 189 ],
186 }, 190 },
187 'VCLinkerTool': { 191 'VCLinkerTool': {
188 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 192 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
189 }, 193 },
190 }, 194 },
191 'dependencies': [ 195 'dependencies': [
192 '../../../sandbox/sandbox.gyp:sandbox', 196 '../../../sandbox/sandbox.gyp:sandbox',
193 '../../../content/content.gyp:sandbox_helper_win', 197 '../../../content/content.gyp:sandbox_helper_win',
194 ], 198 ],
195 }], 199 }],
196 ], 200 ],
197 }, # target_name: views_examples_with_content_exe 201 }, # target_name: views_examples_with_content_exe
198 ], 202 ],
199 } 203 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698