Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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', { | 555 ['OS=="linux" and use_aura==1 and chromeos==0 and use_ozone==0', { |
|
spang
2013/12/16 19:20:59
I don't think this even belongs in common.gypi, bu
dnicoara
2013/12/17 16:41:44
Done.
| |
| 556 'use_clipboard_aurax11%': 1, | 556 'use_clipboard_aurax11%': 1, |
| 557 }], | 557 }], |
| 558 | 558 |
| 559 # Flags to use glib. | 559 # Flags to use glib. |
| 560 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { | 560 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { |
| 561 'use_glib%': 0, | 561 'use_glib%': 0, |
| 562 }, { | 562 }, { |
| 563 'use_glib%': 1, | 563 'use_glib%': 1, |
| 564 }], | 564 }], |
| 565 | 565 |
| (...skipping 4223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4789 # settings in target dicts. SYMROOT is a special case, because many other | 4789 # settings in target dicts. SYMROOT is a special case, because many other |
| 4790 # Xcode variables depend on it, including variables such as | 4790 # Xcode variables depend on it, including variables such as |
| 4791 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4791 # 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 | 4792 # 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 | 4793 # 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, | 4794 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4795 # and therefore SYMROOT, needs to be set at the project level. | 4795 # and therefore SYMROOT, needs to be set at the project level. |
| 4796 'SYMROOT': '<(DEPTH)/xcodebuild', | 4796 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4797 }, | 4797 }, |
| 4798 } | 4798 } |
| OLD | NEW |