diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-19 15:19:53 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-19 15:19:53 +0000 |
| commit | 7cec180a474b699c640243e6b3852bb538c4dc59 (patch) | |
| tree | 3499ff23e82254666458de2f6d02a2ba4c3ba21a /build | |
| parent | 9e99e1777ef1de4bac9eaab86cd66073d1928b86 (diff) | |
| download | chromium_src-7cec180a474b699c640243e6b3852bb538c4dc59.zip chromium_src-7cec180a474b699c640243e6b3852bb538c4dc59.tar.gz chromium_src-7cec180a474b699c640243e6b3852bb538c4dc59.tar.bz2 | |
Revert 207109 "Reland 206804."
The infrastructure can not depend on code.google.com at all, the slaves must never fetch from there.
> Reland 206804.
>
> Pull ANGLE from new git repository.
>
> Switch references to ANGLE repository to use the new directory in third_party.
>
> TBR=kbr@chromium.org, piman@chromium.org
>
> (for ui/compositor)
>
> Review URL: https://codereview.chromium.org/16869007
TBR=apatrick@chromium.org
Review URL: https://codereview.chromium.org/17449008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 06fda37..9f326f9 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1713,7 +1713,7 @@ # The path to the ANGLE library. TODO(apatrick): This is to help # transition to a new version of ANGLE at a new location. After the # transition is complete, this can be removed. - 'angle_path': '<(DEPTH)/third_party/angle_dx11', + 'angle_path': '<(DEPTH)/third_party/angle', # List of default apps to install in new profiles. The first list contains # the source files as found in svn. The second list, used only for linux, @@ -1829,7 +1829,7 @@ 'defines': [ # Set this to use the new DX11 version of ANGLE. # TODO(apatrick): Remove this when the transition is complete. - 'ANGLE_DX11', + #'ANGLE_DX11', ], 'conditions': [ ['(OS=="mac" or OS=="ios") and asan==1', { |