diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 23:03:15 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 23:03:15 +0000 |
| commit | f3b63bc8ea7b4ef0aa474fde036a526c7ef68d59 (patch) | |
| tree | dbfcd40a0ebf203094a9c350e244f7a205ece7d5 /ppapi | |
| parent | c186a24737f7132db4db61566f4c0085e88dc062 (diff) | |
| download | chromium_src-f3b63bc8ea7b4ef0aa474fde036a526c7ef68d59.zip chromium_src-f3b63bc8ea7b4ef0aa474fde036a526c7ef68d59.tar.gz chromium_src-f3b63bc8ea7b4ef0aa474fde036a526c7ef68d59.tar.bz2 | |
Fix NaCl IPC-based proxy build to disable pepper threading for now.
BUG=116317
TEST=none
Review URL: https://codereview.chromium.org/11109004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/ppapi_ipc_proxy_untrusted.gyp | 9 | ||||
| -rw-r--r-- | ppapi/ppapi_ipc_untrusted.gyp | 9 | ||||
| -rw-r--r-- | ppapi/ppapi_shared_untrusted.gyp | 9 |
3 files changed, 9 insertions, 18 deletions
diff --git a/ppapi/ppapi_ipc_proxy_untrusted.gyp b/ppapi/ppapi_ipc_proxy_untrusted.gyp index d2f7fa2..9111d3a 100644 --- a/ppapi/ppapi_ipc_proxy_untrusted.gyp +++ b/ppapi/ppapi_ipc_proxy_untrusted.gyp @@ -27,13 +27,10 @@ 'nlib_target': 'libppapi_proxy_untrusted.a', 'build_glibc': 0, 'build_newlib': 1, - 'defines': [ - 'NACL_PPAPI_IPC_PROXY', - # Enable threading for the untrusted side of the proxy. - # TODO(bbudge) remove when this is the default. - 'ENABLE_PEPPER_THREADING', - ], }, + 'defines': [ + 'NACL_PPAPI_IPC_PROXY', + ], 'include_dirs': [ '..', '../third_party/khronos', diff --git a/ppapi/ppapi_ipc_untrusted.gyp b/ppapi/ppapi_ipc_untrusted.gyp index 1f5c3c9..ec6fdf9 100644 --- a/ppapi/ppapi_ipc_untrusted.gyp +++ b/ppapi/ppapi_ipc_untrusted.gyp @@ -23,13 +23,10 @@ 'nlib_target': 'libppapi_ipc_untrusted.a', 'build_glibc': 0, 'build_newlib': 1, - 'defines': [ - 'NACL_PPAPI_IPC_PROXY', - # Enable threading for the untrusted side of the proxy. - # TODO(bbudge) remove when this is the default. - 'ENABLE_PEPPER_THREADING', - ], }, + 'defines': [ + 'NACL_PPAPI_IPC_PROXY', + ], 'include_dirs': [ '..', ], diff --git a/ppapi/ppapi_shared_untrusted.gyp b/ppapi/ppapi_shared_untrusted.gyp index ef76bd3..2897337 100644 --- a/ppapi/ppapi_shared_untrusted.gyp +++ b/ppapi/ppapi_shared_untrusted.gyp @@ -23,13 +23,10 @@ 'nlib_target': 'libppapi_shared_untrusted.a', 'build_glibc': 0, 'build_newlib': 1, - 'defines': [ - 'NACL_PPAPI_IPC_PROXY', - # Enable threading for the untrusted side of the proxy. - # TODO(bbudge) remove when this is the default. - 'ENABLE_PEPPER_THREADING', - ], }, + 'defines': [ + 'NACL_PPAPI_IPC_PROXY', + ], 'include_dirs': [ '..', '../third_party/khronos', |