summaryrefslogtreecommitdiffstats
path: root/media/media_untrusted.gyp
diff options
context:
space:
mode:
authordalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 23:51:13 +0000
committerdalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 23:51:13 +0000
commitab17025f9e68b3e4ac6156e5b668e5bfba7901fc (patch)
treed5b2c90d896b74120a42f332f6dd4486db60481c /media/media_untrusted.gyp
parentdb26138ce3cd2ac975f01a93dcd278049707abbd (diff)
downloadchromium_src-ab17025f9e68b3e4ac6156e5b668e5bfba7901fc.zip
chromium_src-ab17025f9e68b3e4ac6156e5b668e5bfba7901fc.tar.gz
chromium_src-ab17025f9e68b3e4ac6156e5b668e5bfba7901fc.tar.bz2
Revert 152406 - Introduce shared_memory_support media target for PPAPI.
Allows PPAPI to directly utilize shared memory utility code instead of duplicating it and CHECK'ing for equivalency. Required to eventually convert PPAPI to using an AudioBus and floats in PPB_Audio_Shared::Run(). http://crbug.com/114700 BUG=123203 TEST=unittests Review URL: https://chromiumcodereview.appspot.com/10826296 TBR=dalecurtis@chromium.org Review URL: https://chromiumcodereview.appspot.com/10837350 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media_untrusted.gyp')
-rw-r--r--media/media_untrusted.gyp44
1 files changed, 0 insertions, 44 deletions
diff --git a/media/media_untrusted.gyp b/media/media_untrusted.gyp
deleted file mode 100644
index 4abbe56..0000000
--- a/media/media_untrusted.gyp
+++ /dev/null
@@ -1,44 +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',
- ],
- 'conditions': [
- ['disable_nacl==0 and disable_nacl_untrusted==0', {
- 'targets': [
- {
- 'target_name': 'shared_memory_support_untrusted',
- 'type': 'none',
- 'variables': {
- 'nacl_untrusted_build': 1,
- 'nlib_target': 'libshared_memory_support_untrusted.a',
- 'build_glibc': 0,
- 'build_newlib': 1,
- },
- 'dependencies': [
- '../native_client/tools.gyp:prep_toolchain',
- '../base/base_untrusted.gyp:base_untrusted',
- ],
- 'defines': [
- 'MEDIA_IMPLEMENTATION',
- ],
- 'include_dirs': [
- '..',
- ],
- 'includes': [
- 'shared_memory_support.gypi',
- ],
- 'sources': [
- '<@(shared_memory_support_sources)',
- ],
- },
- ],
- }],
- ],
-}