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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/plugin.gyp

Issue 8524002: Change the native_client chromium build to use the third_party/jsoncpp. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 1 month 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/native_client/src/trusted/plugin/manifest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 'xcode_settings': { 90 'xcode_settings': {
91 'OTHER_LDFLAGS': [ 91 'OTHER_LDFLAGS': [
92 '-Wl,-exported_symbols_list <(DEPTH)/ppapi/native_client/src/tru sted/plugin/ppapi.def' 92 '-Wl,-exported_symbols_list <(DEPTH)/ppapi/native_client/src/tru sted/plugin/ppapi.def'
93 ], 93 ],
94 }, 94 },
95 'dependencies': [ 95 'dependencies': [
96 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', 96 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio',
97 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc', 97 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc',
98 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', 98 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
99 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', 99 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
100 '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:json cpp',
101 '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer', 100 '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
102 '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:no nnacl_util', 101 '<(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', 102 '<(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', 103 '<(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', 104 '<(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', 105 '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service. gyp:reverse_service',
107 '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref', 106 '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
108 '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp :nacl_ppapi_browser', 107 '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp :nacl_ppapi_browser',
109 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', 108 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
109 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
110 ], 110 ],
111 'conditions': [ 111 'conditions': [
112 ['OS=="mac"', { 112 ['OS=="mac"', {
113 'mac_bundle': 1, 113 'mac_bundle': 1,
114 'product_name': 'ppGoogleNaClPluginChrome', 114 'product_name': 'ppGoogleNaClPluginChrome',
115 'product_extension': 'plugin', 115 'product_extension': 'plugin',
116 }], 116 }],
117 ['OS=="mac" and mac_breakpad==1', { 117 ['OS=="mac" and mac_breakpad==1', {
118 'variables': { 118 'variables': {
119 # A real .dSYM is needed for dump_syms to operate on. 119 # A real .dSYM is needed for dump_syms to operate on.
120 'mac_real_dsym': 1, 120 'mac_real_dsym': 1,
121 }, 121 },
122 }], 122 }],
123 ['OS=="win"', { 123 ['OS=="win"', {
124 'dependencies': [ 124 'dependencies': [
125 '<(DEPTH)/native_client/src/trusted/handle_pass/handle_pass.gyp: browserhandle', 125 '<(DEPTH)/native_client/src/trusted/handle_pass/handle_pass.gyp: browserhandle',
126 '<(DEPTH)/native_client/src/trusted/handle_pass/handle_pass.gyp: handle_lookup', 126 '<(DEPTH)/native_client/src/trusted/handle_pass/handle_pass.gyp: handle_lookup',
127 '<(DEPTH)/native_client/src/trusted/handle_pass/handle_pass.gyp: ldrhandle', 127 '<(DEPTH)/native_client/src/trusted/handle_pass/handle_pass.gyp: ldrhandle',
128 ], 128 ],
129 }], 129 }],
130 ], 130 ],
131 }, 131 },
132 ], 132 ],
133 }], 133 }],
134 ], 134 ],
135 } 135 }
OLDNEW
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/manifest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698