diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 16:30:13 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 16:30:13 +0000 |
| commit | 882b8b8123cadfe690eb1707b40460b30c3d691d (patch) | |
| tree | 563ddb5aeeebb42dbf004b8f1becd9899b509709 /gpu/demos | |
| parent | 0c23428a4ffe32a614580b330b66e5b4448fc7af (diff) | |
| download | chromium_src-882b8b8123cadfe690eb1707b40460b30c3d691d.zip chromium_src-882b8b8123cadfe690eb1707b40460b30c3d691d.tar.gz chromium_src-882b8b8123cadfe690eb1707b40460b30c3d691d.tar.bz2 | |
Use PPAPI from chrome trunk rather than pulling via deps. This is a re-land from r64716. This is identical with an an include directory changed in the ppapi repo which I'm hoping was what was confusing everything.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
| -rw-r--r-- | gpu/demos/demos.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index 901ec7c..d205eea 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -127,12 +127,12 @@ 'type': 'static_library', 'dependencies': [ 'gpu_demo_framework', - '../../third_party/ppapi/ppapi.gyp:ppapi_cpp', - '../../third_party/ppapi/ppapi.gyp:ppapi_cpp_objects' + '../../ppapi/ppapi.gyp:ppapi_cpp', + '../../ppapi/ppapi.gyp:ppapi_cpp_objects' ], 'include_dirs': [ '../..', - '../../third_party/ppapi', + '../../ppapi', '../../third_party/gles2_book/Common/Include', ], 'sources': [ @@ -148,7 +148,7 @@ 'include_dirs': [ '../../third_party', '../../third_party/gles2_book/Common/Include', - '../../third_party/ppapi', + '../../ppapi', '../..' ], 'run_as': { |