diff options
author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 15:03:16 +0000 |
---|---|---|
committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 15:03:16 +0000 |
commit | b69afa2be89d69abee78bda14e6d95f933b42aae (patch) | |
tree | eb10a95c93a0efb68545fefb14fb71defcc9fe9d /ppapi/ppapi_shared_untrusted.gyp | |
parent | 1555f8cd3784f3d980098822079e43e18bdb8ba2 (diff) | |
download | chromium_src-b69afa2be89d69abee78bda14e6d95f933b42aae.zip chromium_src-b69afa2be89d69abee78bda14e6d95f933b42aae.tar.gz chromium_src-b69afa2be89d69abee78bda14e6d95f933b42aae.tar.bz2 |
Revert 150343 - Add gpu targets to untrusted build, and add Graphics3D code to untrusted build.
BUG=116317
TEST=builds,manual
With this change, the IPC-based PPAPI proxy builds and runs the tumbler example.
Review URL: https://chromiumcodereview.appspot.com/10796038
TBR=bbudge@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10830197
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_shared_untrusted.gyp')
-rw-r--r-- | ppapi/ppapi_shared_untrusted.gyp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ppapi/ppapi_shared_untrusted.gyp b/ppapi/ppapi_shared_untrusted.gyp index e0a08b4..dba33ad 100644 --- a/ppapi/ppapi_shared_untrusted.gyp +++ b/ppapi/ppapi_shared_untrusted.gyp @@ -23,19 +23,13 @@ 'build_glibc': 0, 'build_newlib': 1, }, - 'defines': [ - 'NACL_PPAPI_IPC_PROXY', - ], 'include_dirs': [ - '..', - '../third_party/khronos', + '../third_party/skia/include/config', ], 'dependencies': [ - '../native_client/tools.gyp:prep_toolchain', + '<(DEPTH)/native_client/tools.gyp:prep_toolchain', '../base/base_untrusted.gyp:base_untrusted', - '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted', - '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', - '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', + '../ipc/ipc_untrusted.gyp:ipc_untrusted', ], }, ], |