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

Side by Side Diff: trunk/src/content/content_browser.gypi

Issue 21910004: Revert 215101 "Linux: use sandbox binary alongside chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/content/browser/browser_main_loop.cc ('k') | 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 (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 'variables': { 6 'variables': {
7 'use_cras%': 0, 7 'use_cras%': 0,
8 }, 8 },
9 'dependencies': [ 9 'dependencies': [
10 'browser/speech/proto/speech_proto.gyp:speech_proto', 10 'browser/speech/proto/speech_proto.gyp:speech_proto',
(...skipping 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1317 # For XShm* in backing_store_x.cc 1317 # For XShm* in backing_store_x.cc
1318 '../build/linux/system.gyp:x11', 1318 '../build/linux/system.gyp:x11',
1319 '../dbus/dbus.gyp:dbus', 1319 '../dbus/dbus.gyp:dbus',
1320 ], 1320 ],
1321 }], 1321 }],
1322 ['OS=="linux"', { 1322 ['OS=="linux"', {
1323 'dependencies': [ 1323 'dependencies': [
1324 '../build/linux/system.gyp:udev', 1324 '../build/linux/system.gyp:udev',
1325 '../sandbox/sandbox.gyp:libc_urandom_override', 1325 '../sandbox/sandbox.gyp:libc_urandom_override',
1326 ], 1326 ],
1327 # Set LINUX_SANDBOX_PATH for Linux, including Chrome OS
1328 'conditions': [
1329 ['linux_sandbox_path != ""', {
1330 'defines': [
1331 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
1332 ],
1333 }],
1334 ],
1327 }], 1335 }],
1328 ['OS=="linux" and use_aura==1', { 1336 ['OS=="linux" and use_aura==1', {
1329 'dependencies': [ 1337 'dependencies': [
1330 '../build/linux/system.gyp:dbus', 1338 '../build/linux/system.gyp:dbus',
1331 '../build/linux/system.gyp:fontconfig', 1339 '../build/linux/system.gyp:fontconfig',
1332 '../dbus/dbus.gyp:dbus', 1340 '../dbus/dbus.gyp:dbus',
1333 ], 1341 ],
1334 }], 1342 }],
1335 ['use_x11==1', { 1343 ['use_x11==1', {
1336 'dependencies': [ 1344 'dependencies': [
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1491 '../third_party/speex/speex.gyp:libspeex', 1499 '../third_party/speex/speex.gyp:libspeex',
1492 ], 1500 ],
1493 }], 1501 }],
1494 ['linux_use_libgps==1', { 1502 ['linux_use_libgps==1', {
1495 'dependencies': [ 1503 'dependencies': [
1496 '../build/linux/system.gyp:libgps', 1504 '../build/linux/system.gyp:libgps',
1497 ], 1505 ],
1498 }], 1506 }],
1499 ], 1507 ],
1500 } 1508 }
OLDNEW
« no previous file with comments | « trunk/src/content/browser/browser_main_loop.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698