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

Side by Side Diff: ppapi/ppapi_internal.gyp

Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « ppapi/ppapi_host.gypi ('k') | ppapi/ppapi_shared_untrusted.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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 28 matching lines...) Expand all
39 }, 39 },
40 'dependencies': [ 40 'dependencies': [
41 'ppapi.gyp:ppapi_c', 41 'ppapi.gyp:ppapi_c',
42 '../base/base.gyp:base', 42 '../base/base.gyp:base',
43 '../base/base.gyp:base_i18n', 43 '../base/base.gyp:base_i18n',
44 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 44 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
45 '../build/temp_gyp/googleurl.gyp:googleurl', 45 '../build/temp_gyp/googleurl.gyp:googleurl',
46 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 46 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
47 '../gpu/gpu.gyp:command_buffer_client', 47 '../gpu/gpu.gyp:command_buffer_client',
48 '../gpu/gpu.gyp:gles2_implementation', 48 '../gpu/gpu.gyp:gles2_implementation',
49 '../media/media.gyp:shared_memory_support',
50 '../net/net.gyp:net', 49 '../net/net.gyp:net',
51 '../skia/skia.gyp:skia', 50 '../skia/skia.gyp:skia',
52 '../third_party/icu/icu.gyp:icuuc', 51 '../third_party/icu/icu.gyp:icuuc',
53 # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL. 52 # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
54 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 53 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
55 '../ui/surface/surface.gyp:surface', 54 '../ui/surface/surface.gyp:surface',
56 ], 55 ],
57 'export_dependent_settings': [ 56 'export_dependent_settings': [
58 '../base/base.gyp:base', 57 '../base/base.gyp:base',
59 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 58 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
(...skipping 26 matching lines...) Expand all
86 'ppapi_shared', 85 'ppapi_shared',
87 ], 86 ],
88 'all_dependent_settings': { 87 'all_dependent_settings': {
89 'include_dirs': [ 88 'include_dirs': [
90 '..', 89 '..',
91 ], 90 ],
92 }, 91 },
93 }, 92 },
94 ] 93 ]
95 } 94 }
OLDNEW
« no previous file with comments | « ppapi/ppapi_host.gypi ('k') | ppapi/ppapi_shared_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698