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

Unified Diff: ppapi/ppapi_proxy_untrusted.gyp

Issue 10546140: Add untrusted NaCl build for PPAPI proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/ppapi_proxy_untrusted.gyp
===================================================================
--- ppapi/ppapi_proxy_untrusted.gyp (revision 141928)
+++ ppapi/ppapi_proxy_untrusted.gyp (working copy)
@@ -2,15 +2,35 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# This is the "public" ppapi.gyp file, which must have dependencies on the
-# redistributable portions of PPAPI only. This prevents circular dependencies
-# in the .gyp files (since ppapi_internal depends on parts of Chrome).
-
{
+ 'variables': {
+ 'chromium_code': 1,
+ },
+ 'includes': [
+ '../native_client/build/untrusted.gypi',
+ 'ppapi_proxy.gypi',
+ ],
'conditions': [
- ['disable_nacl==0 and build_ppapi_ipc_proxy_untrusted==1', {
- 'includes': ['ppapi_proxy_untrusted.gypi'],
+ ['disable_nacl_untrusted==0', {
dmichael (off chromium) 2012/06/14 03:12:41 I see you dropped the build_ppapi_ipc_proxy_untrus
bbudge 2012/06/15 01:07:32 Done.
+ 'targets': [
+ {
+ 'target_name': 'ppapi_proxy_untrusted',
dmichael (off chromium) 2012/06/14 03:12:41 doesn't this target also exist in ppapi_proxy_untr
bbudge 2012/06/15 01:07:32 Done.
+ 'type': 'none',
+ 'variables': {
+ 'ppapi_proxy_target': 1,
+ 'nacl_untrusted_build': 1,
+ 'nlib_target': 'libppapi_proxy_untrusted.a',
+ 'build_glibc': 0,
+ 'build_newlib': 1,
+ },
+ 'dependencies': [
+ '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+ '../base/base_untrusted.gyp:base_untrusted',
+ '../ipc/ipc_untrusted.gyp:ipc_untrusted',
+ '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
+ ],
+ },
+ ],
}],
],
- 'targets': [],
}
« no previous file with comments | « ppapi/ppapi_proxy.gypi ('k') | ppapi/ppapi_shared.gypi » ('j') | ppapi/ppapi_shared.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698