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

Side by Side Diff: content/content_common.gypi

Issue 8589001: Load mac sandbox definitions from resources instead of the bundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: also remove old bundle gyp code Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../build/temp_gyp/googleurl.gyp:googleurl', 8 '../build/temp_gyp/googleurl.gyp:googleurl',
9 '../gpu/gpu.gyp:gpu_ipc', 9 '../gpu/gpu.gyp:gpu_ipc',
10 '../ipc/ipc.gyp:ipc', 10 '../ipc/ipc.gyp:ipc',
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 ], 265 ],
266 }], 266 }],
267 ['OS=="mac"', { 267 ['OS=="mac"', {
268 'sources!': [ 268 'sources!': [
269 'common/process_watcher_posix.cc', 269 'common/process_watcher_posix.cc',
270 ], 270 ],
271 'sources': [ 271 'sources': [
272 'common/gpu/image_transport_surface.cc', 272 'common/gpu/image_transport_surface.cc',
273 'common/gpu/image_transport_surface_mac.cc', 273 'common/gpu/image_transport_surface_mac.cc',
274 ], 274 ],
275 'link_settings': {
276 'mac_bundle_resources': [
277 'common/common.sb',
278 ],
279 },
280 }], 275 }],
281 ['toolkit_uses_gtk == 1', { 276 ['toolkit_uses_gtk == 1', {
282 'dependencies': [ 277 'dependencies': [
283 '../build/linux/system.gyp:gtk', 278 '../build/linux/system.gyp:gtk',
284 ], 279 ],
285 }], 280 }],
286 ['use_x11 == 1', { 281 ['use_x11 == 1', {
287 'dependencies': [ 282 'dependencies': [
288 '../build/linux/system.gyp:pangocairo', 283 '../build/linux/system.gyp:pangocairo',
289 ], 284 ],
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 ], 324 ],
330 'link_settings': { 325 'link_settings': {
331 'libraries': [ 326 'libraries': [
332 '-lEGL', 327 '-lEGL',
333 '-lGLESv2', 328 '-lGLESv2',
334 ], 329 ],
335 }, 330 },
336 }], 331 }],
337 ], 332 ],
338 } 333 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698