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

Side by Side Diff: ppapi/ppapi_internal.gyp

Issue 954873002: Fix content_browsertests on Linux GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 9 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
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, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 }, 8 },
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 '../base/base.gyp:base', 62 '../base/base.gyp:base',
63 ], 63 ],
64 'conditions': [ 64 'conditions': [
65 ['OS=="mac"', { 65 ['OS=="mac"', {
66 'link_settings': { 66 'link_settings': {
67 'libraries': [ 67 'libraries': [
68 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 68 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
69 ], 69 ],
70 }, 70 },
71 }], 71 }],
72 ['chrome_multiple_dll==1', {
73 'dependencies': [
74 '../third_party/WebKit/public/blink.gyp:blink_minimal',
75 ],
76 'export_dependent_settings': [
77 '../third_party/WebKit/public/blink.gyp:blink_minimal',
78 ],
79 }, {
80 'dependencies': [
81 '../third_party/WebKit/public/blink.gyp:blink',
82 ],
83 'export_dependent_settings': [
84 '../third_party/WebKit/public/blink.gyp:blink',
85 ],
86 }],
87 ], 72 ],
88 }, 73 },
89 ], 74 ],
90 'conditions': [ 75 'conditions': [
91 ['component=="static_library"', { 76 ['component=="static_library"', {
92 # In a static build, build ppapi_ipc separately. 77 # In a static build, build ppapi_ipc separately.
93 'targets': [ 78 'targets': [
94 { 79 {
95 # GN version: //ppapi/proxy:ipc 80 # GN version: //ppapi/proxy:ipc
96 'target_name': 'ppapi_ipc', 81 'target_name': 'ppapi_ipc',
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 }, 264 },
280 'configurations': { 265 'configurations': {
281 'Common_Base': { 266 'Common_Base': {
282 'msvs_target_platform': 'x64', 267 'msvs_target_platform': 'x64',
283 }, 268 },
284 }, 269 },
285 }], 270 }],
286 }], 271 }],
287 ], 272 ],
288 } 273 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698