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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/plugin.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
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'includes': [ 7 'includes': [
8 'plugin.gypi', 8 'plugin.gypi',
9 ], 9 ],
10 'target_defaults': { 10 'target_defaults': {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 'conditions': [ 53 'conditions': [
54 ['nacl_standalone==1', { 54 ['nacl_standalone==1', {
55 'targets': [ 55 'targets': [
56 { 56 {
57 'target_name': 'ppGoogleNaClPlugin', 57 'target_name': 'ppGoogleNaClPlugin',
58 'type': 'shared_library', 58 'type': 'shared_library',
59 'variables': { 59 'variables': {
60 'target_base': 'ppNaClPlugin', 60 'target_base': 'ppNaClPlugin',
61 }, 61 },
62 'dependencies': [ 62 'dependencies': [
63 '<(DEPTH)/media/media.gyp:shared_memory_support',
64 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', 63 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio',
65 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc', 64 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc',
66 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', 65 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
67 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', 66 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
68 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', 67 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
69 '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:json cpp', 68 '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:json cpp',
70 '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer', 69 '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
71 '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:no nnacl_util', 70 '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:no nnacl_util',
72 '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualif y.gyp:platform_qual_lib', 71 '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualif y.gyp:platform_qual_lib',
73 '<(DEPTH)/native_client/src/trusted/gio/gio_wrapped_desc.gyp:gio_wra pped_desc', 72 '<(DEPTH)/native_client/src/trusted/gio/gio_wrapped_desc.gyp:gio_wra pped_desc',
(...skipping 12 matching lines...) Expand all
86 'type': 'loadable_module', 85 'type': 'loadable_module',
87 'sources': [ 86 'sources': [
88 '<@(common_sources)', 87 '<@(common_sources)',
89 ], 88 ],
90 'xcode_settings': { 89 'xcode_settings': {
91 'OTHER_LDFLAGS': [ 90 'OTHER_LDFLAGS': [
92 '-Wl,-exported_symbols_list <(DEPTH)/ppapi/native_client/src/tru sted/plugin/ppapi.def' 91 '-Wl,-exported_symbols_list <(DEPTH)/ppapi/native_client/src/tru sted/plugin/ppapi.def'
93 ], 92 ],
94 }, 93 },
95 'dependencies': [ 94 'dependencies': [
96 '<(DEPTH)/media/media.gyp:shared_memory_support',
97 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', 95 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio',
98 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc', 96 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc',
99 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', 97 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
100 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', 98 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
101 '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer', 99 '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
102 '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:no nnacl_util', 100 '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:no nnacl_util',
103 '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualif y.gyp:platform_qual_lib', 101 '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualif y.gyp:platform_qual_lib',
104 '<(DEPTH)/native_client/src/trusted/gio/gio_wrapped_desc.gyp:gio_wra pped_desc', 102 '<(DEPTH)/native_client/src/trusted/gio/gio_wrapped_desc.gyp:gio_wra pped_desc',
105 '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gy p:simple_service', 103 '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gy p:simple_service',
106 '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service. gyp:reverse_service', 104 '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service. gyp:reverse_service',
(...skipping 13 matching lines...) Expand all
120 # A real .dSYM is needed for dump_syms to operate on. 118 # A real .dSYM is needed for dump_syms to operate on.
121 'mac_real_dsym': 1, 119 'mac_real_dsym': 1,
122 }, 120 },
123 }], 121 }],
124 ], 122 ],
125 }, 123 },
126 ], 124 ],
127 }], 125 }],
128 ], 126 ],
129 } 127 }
OLDNEW
« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp ('k') | ppapi/ppapi_host.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698