Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: trunk/src/build/common.gypi

Issue 17337002: Revert 206804 "Pull ANGLE from new git repository." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/build/common.gypi
===================================================================
--- trunk/src/build/common.gypi (revision 206827)
+++ trunk/src/build/common.gypi (working copy)
@@ -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', {
« no previous file with comments | « trunk/src/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698