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

Side by Side Diff: ppapi/ppapi_internal.gyp

Issue 1714903003: mustash: Move gpu/ipc to gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Win64 build Created 4 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
« no previous file with comments | « ppapi/native_client/BUILD.gn ('k') | ppapi/ppapi_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) 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 'targets': [ 77 'targets': [
78 { 78 {
79 # GN version: //ppapi/proxy:ipc 79 # GN version: //ppapi/proxy:ipc
80 'target_name': 'ppapi_ipc', 80 'target_name': 'ppapi_ipc',
81 'type': 'static_library', 81 'type': 'static_library',
82 'variables': { 82 'variables': {
83 'ppapi_ipc_target': 1, 83 'ppapi_ipc_target': 1,
84 }, 84 },
85 'dependencies': [ 85 'dependencies': [
86 '../base/base.gyp:base', 86 '../base/base.gyp:base',
87 '../gpu/gpu.gyp:gpu_ipc', 87 '../gpu/gpu.gyp:gpu_ipc_common',
88 '../ipc/ipc.gyp:ipc', 88 '../ipc/ipc.gyp:ipc',
89 '../skia/skia.gyp:skia', 89 '../skia/skia.gyp:skia',
90 'ppapi.gyp:ppapi_c', 90 'ppapi.gyp:ppapi_c',
91 'ppapi_shared', 91 'ppapi_shared',
92 ], 92 ],
93 'all_dependent_settings': { 93 'all_dependent_settings': {
94 'include_dirs': [ 94 'include_dirs': [
95 '..', 95 '..',
96 ], 96 ],
97 }, 97 },
98 }, 98 },
99 { 99 {
100 # GN version: //ppapi/proxy 100 # GN version: //ppapi/proxy
101 'target_name': 'ppapi_proxy', 101 'target_name': 'ppapi_proxy',
102 'type': 'static_library', 102 'type': 'static_library',
103 'variables': { 103 'variables': {
104 'ppapi_proxy_target': 1, 104 'ppapi_proxy_target': 1,
105 }, 105 },
106 'dependencies': [ 106 'dependencies': [
107 '../base/base.gyp:base', 107 '../base/base.gyp:base',
108 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 108 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
109 '../gin/gin.gyp:gin', 109 '../gin/gin.gyp:gin',
110 '../gpu/gpu.gyp:gles2_implementation', 110 '../gpu/gpu.gyp:gles2_implementation',
111 '../gpu/gpu.gyp:gpu_ipc', 111 '../gpu/gpu.gyp:gpu_ipc_common',
112 '../media/media.gyp:shared_memory_support', 112 '../media/media.gyp:shared_memory_support',
113 '../ipc/ipc.gyp:ipc', 113 '../ipc/ipc.gyp:ipc',
114 '../skia/skia.gyp:skia', 114 '../skia/skia.gyp:skia',
115 '../third_party/icu/icu.gyp:icuuc', 115 '../third_party/icu/icu.gyp:icuuc',
116 '../third_party/icu/icu.gyp:icui18n', 116 '../third_party/icu/icu.gyp:icui18n',
117 '../ui/surface/surface.gyp:surface', 117 '../ui/surface/surface.gyp:surface',
118 'ppapi.gyp:ppapi_c', 118 'ppapi.gyp:ppapi_c',
119 'ppapi_shared', 119 'ppapi_shared',
120 'ppapi_ipc', 120 'ppapi_ipc',
121 ], 121 ],
(...skipping 27 matching lines...) Expand all
149 # Setting both variables means we pull in the sources from both 149 # Setting both variables means we pull in the sources from both
150 # ppapi_ipc.gypi and ppapi_proxy.gypi. 150 # ppapi_ipc.gypi and ppapi_proxy.gypi.
151 'ppapi_ipc_target': 1, 151 'ppapi_ipc_target': 1,
152 'ppapi_proxy_target': 1, 152 'ppapi_proxy_target': 1,
153 }, 153 },
154 'dependencies': [ 154 'dependencies': [
155 '../base/base.gyp:base', 155 '../base/base.gyp:base',
156 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 156 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
157 '../gin/gin.gyp:gin', 157 '../gin/gin.gyp:gin',
158 '../gpu/gpu.gyp:gles2_implementation', 158 '../gpu/gpu.gyp:gles2_implementation',
159 '../gpu/gpu.gyp:gpu_ipc', 159 '../gpu/gpu.gyp:gpu_ipc_common',
160 '../media/media.gyp:shared_memory_support', 160 '../media/media.gyp:shared_memory_support',
161 '../ipc/ipc.gyp:ipc', 161 '../ipc/ipc.gyp:ipc',
162 '../skia/skia.gyp:skia', 162 '../skia/skia.gyp:skia',
163 '../third_party/icu/icu.gyp:icuuc', 163 '../third_party/icu/icu.gyp:icuuc',
164 '../third_party/icu/icu.gyp:icui18n', 164 '../third_party/icu/icu.gyp:icui18n',
165 '../ui/surface/surface.gyp:surface', 165 '../ui/surface/surface.gyp:surface',
166 'ppapi.gyp:ppapi_c', 166 'ppapi.gyp:ppapi_c',
167 'ppapi_shared', 167 'ppapi_shared',
168 ], 168 ],
169 'all_dependent_settings': { 169 'all_dependent_settings': {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 # (Should be automagical when compiling in the 64-bit toolchain.) 233 # (Should be automagical when compiling in the 64-bit toolchain.)
234 'target_name': 'ppapi_ipc_win64', 234 'target_name': 'ppapi_ipc_win64',
235 'type': 'static_library', 235 'type': 'static_library',
236 'variables': { 236 'variables': {
237 'nacl_win64_target': 1, 237 'nacl_win64_target': 1,
238 'ppapi_ipc_target': 1, 238 'ppapi_ipc_target': 1,
239 }, 239 },
240 'dependencies': [ 240 'dependencies': [
241 '../base/base.gyp:base_win64', 241 '../base/base.gyp:base_win64',
242 '../ipc/ipc.gyp:ipc_win64', 242 '../ipc/ipc.gyp:ipc_win64',
243 '../gpu/gpu.gyp:gpu_ipc_win64', 243 '../gpu/gpu.gyp:gpu_ipc_common_win64',
244 'ppapi.gyp:ppapi_c', 244 'ppapi.gyp:ppapi_c',
245 'ppapi_shared_win64', 245 'ppapi_shared_win64',
246 ], 246 ],
247 'export_dependent_settings': [ 247 'export_dependent_settings': [
248 '../gpu/gpu.gyp:gpu_ipc_win64', 248 '../gpu/gpu.gyp:gpu_ipc_common_win64',
249 ], 249 ],
250 'defines': [ 250 'defines': [
251 '<@(nacl_win64_defines)', 251 '<@(nacl_win64_defines)',
252 ], 252 ],
253 'all_dependent_settings': { 253 'all_dependent_settings': {
254 'include_dirs': [ 254 'include_dirs': [
255 '..', 255 '..',
256 ], 256 ],
257 }, 257 },
258 'configurations': { 258 'configurations': {
259 'Common_Base': { 259 'Common_Base': {
260 'msvs_target_platform': 'x64', 260 'msvs_target_platform': 'x64',
261 }, 261 },
262 }, 262 },
263 }], 263 }],
264 }], 264 }],
265 ], 265 ],
266 } 266 }
OLDNEW
« no previous file with comments | « ppapi/native_client/BUILD.gn ('k') | ppapi/ppapi_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698