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

Side by Side Diff: trunk/src/ui/compositor/compositor.gyp

Issue 15838015: Revert 202787 "Remove unnecessary ui::CompositorTestSupport" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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
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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2', 72 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
73 ], 73 ],
74 }], 74 }],
75 ], 75 ],
76 }, 76 },
77 { 77 {
78 'target_name': 'compositor_test_support', 78 'target_name': 'compositor_test_support',
79 'type': 'static_library', 79 'type': 'static_library',
80 'dependencies': [ 80 'dependencies': [
81 '<(DEPTH)/base/base.gyp:base', 81 '<(DEPTH)/base/base.gyp:base',
82 '<(DEPTH)/skia/skia.gyp:skia', 82 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
83 '<(DEPTH)/ui/gl/gl.gyp:gl', 83 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
84 '<(DEPTH)/ui/ui.gyp:ui',
85 'compositor',
86 ], 84 ],
87 'sources': [ 85 'sources': [
86 'test/compositor_test_support.cc',
87 'test/compositor_test_support.h',
88 'test/test_layers.cc', 88 'test/test_layers.cc',
89 'test/test_layers.h', 89 'test/test_layers.h',
90 'test/test_suite.cc', 90 'test/test_suite.cc',
91 'test/test_suite.h', 91 'test/test_suite.h',
92 ], 92 ],
93 'conditions': [
94 ['os_posix == 1 and OS != "mac"', {
95 'conditions': [
96 ['linux_use_tcmalloc==1', {
97 'dependencies': [
98 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
99 ],
100 }],
101 ],
102 }],
103 ],
93 }, 104 },
94 { 105 {
95 'target_name': 'compositor_unittests', 106 'target_name': 'compositor_unittests',
96 'type': 'executable', 107 'type': 'executable',
97 'dependencies': [ 108 'dependencies': [
98 '<(DEPTH)/base/base.gyp:base', 109 '<(DEPTH)/base/base.gyp:base',
99 '<(DEPTH)/base/base.gyp:test_support_base', 110 '<(DEPTH)/base/base.gyp:test_support_base',
100 '<(DEPTH)/cc/cc.gyp:cc', 111 '<(DEPTH)/cc/cc.gyp:cc',
101 '<(DEPTH)/cc/cc_tests.gyp:cc_test_utils', 112 '<(DEPTH)/cc/cc_tests.gyp:cc_test_utils',
102 '<(DEPTH)/skia/skia.gyp:skia', 113 '<(DEPTH)/skia/skia.gyp:skia',
(...skipping 23 matching lines...) Expand all
126 'test/test_utils.cc', 137 'test/test_utils.cc',
127 'test/test_utils.h', 138 'test/test_utils.h',
128 ], 139 ],
129 'conditions': [ 140 'conditions': [
130 # osmesa GL implementation is used on linux. 141 # osmesa GL implementation is used on linux.
131 ['OS=="linux"', { 142 ['OS=="linux"', {
132 'dependencies': [ 143 'dependencies': [
133 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 144 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
134 ], 145 ],
135 }], 146 }],
136 ['os_posix == 1 and OS != "mac"', {
137 'conditions': [
138 ['linux_use_tcmalloc==1', {
139 'dependencies': [
140 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
141 ],
142 }],
143 ],
144 }],
145 ], 147 ],
146 }, 148 },
147 ], 149 ],
148 } 150 }
OLDNEW
« no previous file with comments | « trunk/src/ui/aura/test/test_suite.cc ('k') | trunk/src/ui/compositor/test/compositor_test_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698