diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 23:29:46 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 23:29:46 +0000 |
| commit | eba8b9fde6aa67fc1de6a73c532f116dd59a1bee (patch) | |
| tree | fc25382fc9e7d870760fa64e86448ae9dcfb6d1a /build | |
| parent | 25c8b3071d3090da0eda957b814650ac9ad5e878 (diff) | |
| download | chromium_src-eba8b9fde6aa67fc1de6a73c532f116dd59a1bee.zip chromium_src-eba8b9fde6aa67fc1de6a73c532f116dd59a1bee.tar.gz chromium_src-eba8b9fde6aa67fc1de6a73c532f116dd59a1bee.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207109 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 9f326f9..06fda37 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', + 'angle_path': '<(DEPTH)/third_party/angle_dx11', # 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', { |