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

Side by Side Diff: build/common.gypi

Issue 102163005: Do not define use_clipboard_aurax11 on ozone builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: desktop_linux Created 7 years 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 | « no previous file | ui/ui.gyp » ('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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 'use_udev%': 0, 545 'use_udev%': 0,
546 }], 546 }],
547 547
548 # Flags to use X11 on non-Mac POSIX platforms. 548 # Flags to use X11 on non-Mac POSIX platforms.
549 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', { 549 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', {
550 'use_x11%': 0, 550 'use_x11%': 0,
551 }, { 551 }, {
552 'use_x11%': 1, 552 'use_x11%': 1,
553 }], 553 }],
554 554
555 ['OS=="linux" and use_aura==1 and chromeos==0', {
556 'use_clipboard_aurax11%': 1,
557 }],
558
559 # Flags to use glib. 555 # Flags to use glib.
560 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { 556 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', {
561 'use_glib%': 0, 557 'use_glib%': 0,
562 }, { 558 }, {
563 'use_glib%': 1, 559 'use_glib%': 1,
564 }], 560 }],
565 561
566 # Flags to use pango and cairo. 562 # Flags to use pango and cairo.
567 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { 563 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', {
568 'use_pango%': 0, 564 'use_pango%': 0,
(...skipping 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after
1896 # This is the default platform 1892 # This is the default platform
1897 'ozone_platform%': "test", 1893 'ozone_platform%': "test",
1898 1894
1899 # Enable built-in ozone platforms if ozone is enabled. 1895 # Enable built-in ozone platforms if ozone is enabled.
1900 'ozone_platform_dri%': 1, 1896 'ozone_platform_dri%': 1,
1901 'ozone_platform_test%': 1, 1897 'ozone_platform_test%': 1,
1902 }, { # use_ozone==0 1898 }, { # use_ozone==0
1903 'ozone_platform_dri%': 0, 1899 'ozone_platform_dri%': 0,
1904 'ozone_platform_test%': 0, 1900 'ozone_platform_test%': 0,
1905 }], 1901 }],
1902
1903 ['desktop_linux==1 and use_aura==1 and use_x11==1', {
1904 'use_clipboard_aurax11%': 1,
1905 }],
1906
1906 ['OS=="win" and use_goma==1', { 1907 ['OS=="win" and use_goma==1', {
1907 # goma doesn't support pch yet. 1908 # goma doesn't support pch yet.
1908 'chromium_win_pch': 0, 1909 'chromium_win_pch': 0,
1909 # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1. 1910 # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1.
1910 'conditions': [ 1911 'conditions': [
1911 ['fastbuild==0', { 1912 ['fastbuild==0', {
1912 'win_z7': 1, 1913 'win_z7': 1,
1913 }], 1914 }],
1914 ], 1915 ],
1915 }], 1916 }],
(...skipping 2873 matching lines...) Expand 10 before | Expand all | Expand 10 after
4789 # settings in target dicts. SYMROOT is a special case, because many other 4790 # settings in target dicts. SYMROOT is a special case, because many other
4790 # Xcode variables depend on it, including variables such as 4791 # Xcode variables depend on it, including variables such as
4791 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4792 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4792 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4793 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4793 # files to appear (when present) in the UI as actual files and not red 4794 # files to appear (when present) in the UI as actual files and not red
4794 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4795 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4795 # and therefore SYMROOT, needs to be set at the project level. 4796 # and therefore SYMROOT, needs to be set at the project level.
4796 'SYMROOT': '<(DEPTH)/xcodebuild', 4797 'SYMROOT': '<(DEPTH)/xcodebuild',
4797 }, 4798 },
4798 } 4799 }
OLDNEW
« no previous file with comments | « no previous file | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698