summaryrefslogtreecommitdiffstats
path: root/ppapi/ppapi_shared_untrusted.gyp
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 22:15:53 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 22:15:53 +0000
commit3375e1a876e293d8acec655fb97273399ef46091 (patch)
treea7cc81377be61f901bbc093462af182f8a7cfff2 /ppapi/ppapi_shared_untrusted.gyp
parentced8e8d8ccea289ce8dde43aa04617f417f63596 (diff)
downloadchromium_src-3375e1a876e293d8acec655fb97273399ef46091.zip
chromium_src-3375e1a876e293d8acec655fb97273399ef46091.tar.gz
chromium_src-3375e1a876e293d8acec655fb97273399ef46091.tar.bz2
Revert 142482 - Add untrusted NaCl build for PPAPI proxy.
This patch refactors ppapi_shared.gypi and ppapi_proxy.gypi into proper includes, adds ppapi_shared_untrusted and ppapi_proxy_untrusted .gyp files, and integrates them into the nacl_irt build (ppapi/native_client/native_client.gyp). In order to build without link errors, it includes our plugin side initialization of PluginDispatcher, and a PpapiPluginMain definition. When the 'build_ppapi_ipc_proxy_untrusted' gyp flag is set to '1', this will build a working NaCl IRT using the Chrome IPC proxy. BUG=116317 TEST=compiles, runs HelloWorld and GetURL SDK examples. Review URL: https://chromiumcodereview.appspot.com/10546140 TBR=bbudge@chromium.org Review URL: https://chromiumcodereview.appspot.com/10565012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_shared_untrusted.gyp')
-rw-r--r--ppapi/ppapi_shared_untrusted.gyp35
1 files changed, 0 insertions, 35 deletions
diff --git a/ppapi/ppapi_shared_untrusted.gyp b/ppapi/ppapi_shared_untrusted.gyp
deleted file mode 100644
index 2da5616..0000000
--- a/ppapi/ppapi_shared_untrusted.gyp
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'variables': {
- 'chromium_code': 1,
- },
- 'includes': [
- '../native_client/build/untrusted.gypi',
- 'ppapi_shared.gypi',
- ],
- 'conditions': [
- ['disable_nacl==0 and disable_nacl_untrusted==0', {
- 'targets': [
- {
- 'target_name': 'ppapi_shared_untrusted',
- 'type': 'none',
- 'variables': {
- 'ppapi_shared_target': 1,
- 'nacl_untrusted_build': 1,
- 'nlib_target': 'libppapi_shared_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',
- ],
- },
- ],
- }],
- ],
-}