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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 8889022: Attempt 2 at : Makes tests either use mock compositor or mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests.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) 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'chrome', 8 'target_name': 'chrome',
9 'type': 'executable', 9 'type': 'executable',
10 'mac_bundle': 1, 10 'mac_bundle': 1,
(...skipping 24 matching lines...) Expand all
35 # be necessary to list app-Info.plist once, not the three times it is 35 # be necessary to list app-Info.plist once, not the three times it is
36 # listed here. 36 # listed here.
37 'mac_bundle_resources!': [ 37 'mac_bundle_resources!': [
38 'app/app-Info.plist', 38 'app/app-Info.plist',
39 ], 39 ],
40 'xcode_settings': { 40 'xcode_settings': {
41 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves', 41 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves',
42 'INFOPLIST_FILE': 'app/app-Info.plist', 42 'INFOPLIST_FILE': 'app/app-Info.plist',
43 }, 43 },
44 'conditions': [ 44 'conditions': [
45 ['use_aura==1 and use_webkit_compositor==0', {
46 'dependencies': [
47 '../ui/gfx/compositor/compositor.gyp:test_compositor',
48 ],
49 }],
45 ['OS == "android"', { 50 ['OS == "android"', {
46 # Don't put the 'chrome' target in 'all' on android 51 # Don't put the 'chrome' target in 'all' on android
47 'suppress_wildcard': 1, 52 'suppress_wildcard': 1,
48 }], 53 }],
49 ['os_posix == 1 and OS != "mac"', { 54 ['os_posix == 1 and OS != "mac"', {
50 'actions': [ 55 'actions': [
51 { 56 {
52 'action_name': 'manpage', 57 'action_name': 'manpage',
53 'conditions': [ 58 'conditions': [
54 [ 'branding == "Chrome"', { 59 [ 'branding == "Chrome"', {
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 'configurations': { 551 'configurations': {
547 'Common_Base': { 552 'Common_Base': {
548 'msvs_target_platform': 'x64', 553 'msvs_target_platform': 'x64',
549 }, 554 },
550 }, 555 },
551 }, 556 },
552 ], 557 ],
553 }], 558 }],
554 ], 559 ],
555 } 560 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698