diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 21:35:39 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 21:35:39 +0000 |
| commit | 6b4ebe8001fbf4175ef26c834834c76ebb005ab8 (patch) | |
| tree | 56cc0994b13195cc7af0421a95093eb75e63a0e6 | |
| parent | 6555ae1a8a9172d80e9ba83039b8dba18da307a3 (diff) | |
| download | chromium_src-6b4ebe8001fbf4175ef26c834834c76ebb005ab8.zip chromium_src-6b4ebe8001fbf4175ef26c834834c76ebb005ab8.tar.gz chromium_src-6b4ebe8001fbf4175ef26c834834c76ebb005ab8.tar.bz2 | |
Pull ANGLE from new git repository.
Switch references to ANGLE repository to use the new directory in third_party.
BUG=247158
R=kbr@chromium.org
Review URL: https://codereview.chromium.org/16123033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206804 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 6 | ||||
| -rw-r--r-- | build/common.gypi | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -66,9 +66,15 @@ deps = { "src/testing/gmock": (Var("googlecode_url") % "googlemock") + "/trunk@410", + # TODO(apatrick): Remove dependency on old DX9 version of ANGLE when + # transition to new DX11 version is complete. "src/third_party/angle": (Var("googlecode_url") % "angleproject") + "/trunk@2249", + "src/third_party/angle_dx11": + "https://code.google.com" + + "/p/angleproject.git@d089bd98e59b037f7f61df926172b5f25e3556cd", + "src/third_party/trace-viewer": (Var("googlecode_url") % "trace-viewer") + "/trunk@621", diff --git a/build/common.gypi b/build/common.gypi index 29476b7..f403f35 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', { |