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

Side by Side Diff: ui/surface/surface.gyp

Issue 1089773003: Revert of Fix errors found in Mac gn component builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « ui/surface/BUILD.gn ('k') | ui/views/BUILD.gn » ('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 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
11 ['use_x11 == 1', { 11 ['use_x11 == 1', {
12 'include_dirs': [ 12 'include_dirs': [
13 '../../third_party/khronos', 13 '../../third_party/khronos',
14 ], 14 ],
15 }], 15 }],
16 ['OS == "mac"', { 16 ['OS == "mac"', {
17 # Required by accelerated_surface_mac.cc.
18 'link_settings': { 17 'link_settings': {
19 'libraries': [ 18 'libraries': [
20 '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework', 19 '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
21 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
22 ], 20 ],
23 }, 21 },
24 }], 22 }],
25 ], 23 ],
26 }, 24 },
27 'targets': [ 25 'targets': [
28 { 26 {
29 'target_name': 'surface', 27 'target_name': 'surface',
30 'type': '<(component)', 28 'type': '<(component)',
31 'dependencies': [ 29 'dependencies': [
(...skipping 12 matching lines...) Expand all
44 'transport_dib.h', 42 'transport_dib.h',
45 'transport_dib_posix.cc', 43 'transport_dib_posix.cc',
46 'transport_dib_win.cc', 44 'transport_dib_win.cc',
47 ], 45 ],
48 'defines': [ 46 'defines': [
49 'SURFACE_IMPLEMENTATION', 47 'SURFACE_IMPLEMENTATION',
50 ], 48 ],
51 }, 49 },
52 ], 50 ],
53 } 51 }
OLDNEW
« no previous file with comments | « ui/surface/BUILD.gn ('k') | ui/views/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698