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

Side by Side Diff: chromeos/chromeos.gyp

Issue 153223002: Use gyp targets to link in X11 libraries instead of setting -lXfoo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address feedback, try to fix cros_x86 gyp error Created 6 years, 10 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 | « chrome/chrome_common.gypi ('k') | content/content_common.gypi » ('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 (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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chromeos_memory.gypi', 10 'chromeos_memory.gypi',
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 'system/name_value_pairs_parser.h', 338 'system/name_value_pairs_parser.h',
339 'system/statistics_provider.cc', 339 'system/statistics_provider.cc',
340 'system/statistics_provider.h', 340 'system/statistics_provider.h',
341 'tpm_token_loader.cc', 341 'tpm_token_loader.cc',
342 'tpm_token_loader.h' 342 'tpm_token_loader.h'
343 ], 343 ],
344 'conditions': [ 344 'conditions': [
345 ['use_x11 == 1', { 345 ['use_x11 == 1', {
346 'dependencies': [ 346 'dependencies': [
347 '../build/linux/system.gyp:glib', 347 '../build/linux/system.gyp:glib',
348 '../build/linux/system.gyp:x11',
349 '../build/linux/system.gyp:xext',
350 '../build/linux/system.gyp:xi',
351 '../build/linux/system.gyp:xrandr',
348 ], 352 ],
349 'link_settings': {
350 'libraries': [
351 '-lX11',
352 '-lXext',
353 '-lXi',
354 '-lXrandr',
355 ],
356 },
357 }, { 353 }, {
358 # use_x11 == 0 354 # use_x11 == 0
359 'sources!': [ 355 'sources!': [
360 'ime/xkeyboard.cc', 356 'ime/xkeyboard.cc',
361 'ime/xkeyboard.h', 357 'ime/xkeyboard.h',
362 'display/output_configurator.cc', 358 'display/output_configurator.cc',
363 'display/output_configurator.h', 359 'display/output_configurator.h',
364 'display/output_util.cc', 360 'display/output_util.cc',
365 'display/output_util.h', 361 'display/output_util.h',
366 'display/real_output_configurator_delegate.cc', 362 'display/real_output_configurator_delegate.cc',
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 '../third_party/cros_system_api/dbus/power_manager/suspend.proto', 546 '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
551 ], 547 ],
552 'variables': { 548 'variables': {
553 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager', 549 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
554 'proto_out_dir': 'chromeos/dbus/power_manager', 550 'proto_out_dir': 'chromeos/dbus/power_manager',
555 }, 551 },
556 'includes': ['../build/protoc.gypi'], 552 'includes': ['../build/protoc.gypi'],
557 }, 553 },
558 ], 554 ],
559 } 555 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698