diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 15:59:56 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 15:59:56 +0000 |
| commit | 27c6115d06c4abf1f30d923202db07cf8a71b2cd (patch) | |
| tree | a0bb7dd0f8fd17a1a99e34ad2bebcb0cc4c2c9fc /ppapi | |
| parent | 9d86cf75b1e720979b71b8943e7cd68e9687a981 (diff) | |
| download | chromium_src-27c6115d06c4abf1f30d923202db07cf8a71b2cd.zip chromium_src-27c6115d06c4abf1f30d923202db07cf8a71b2cd.tar.gz chromium_src-27c6115d06c4abf1f30d923202db07cf8a71b2cd.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@64750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/codereview.settings | 5 | ||||
| -rw-r--r-- | ppapi/ppapi.gyp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ppapi/codereview.settings b/ppapi/codereview.settings deleted file mode 100644 index 427abb4..0000000 --- a/ppapi/codereview.settings +++ /dev/null @@ -1,5 +0,0 @@ -# This file is used by gcl to get repository specific information. -CODE_REVIEW_SERVER: codereview.chromium.org -CC_LIST: chromium-reviews@chromium.org -VIEW_VC: http://code.google.com/p/ppapi/source/detail?r= - diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp index 13b1dd6..a404bed 100644 --- a/ppapi/ppapi.gyp +++ b/ppapi/ppapi.gyp @@ -30,7 +30,10 @@ 'type': 'none', 'all_dependent_settings': { 'include_dirs': [ - '..', + # HOLEY (*#@$@ing #&$^@*&$^. ChromeOS depends on having + # "third_party" in the include path which the old version of this + # project did. This is a temporary hack to keep the build going. + '../third_party', ], }, 'sources': [ |
