Update dependencies to use new angle repository.

BUG=319527

Review URL: https://codereview.chromium.org/106623003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240595 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/buildbot/deps_whitelist.py

@@ -36,7 +36,6 @@ def __init__(self):
       'testing/gtest',
       'third_party/WebKit',
       'third_party/angle',
-      'third_party/angle_dx11',
       ('third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/'
        'braille'),
       'third_party/freetype',

build/all.gyp

@@ -164,7 +164,7 @@
             '../courgette/courgette.gyp:*',
             '../rlz/rlz.gyp:*',
             '../sandbox/sandbox.gyp:*',
-            '../third_party/angle_dx11/src/build_angle.gyp:*',
+            '<(angle_path)/src/build_angle.gyp:*',
             '../third_party/bspatch/bspatch.gyp:*',
           ],
         }, {

build/common.gypi

@@ -1922,11 +1922,8 @@
       }],
     ],
 
-
-    # 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',
+    # The path to the ANGLE library.
+    '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,

content/DEPS

@@ -57,7 +57,7 @@ include_rules = [
   "-tools",
 
   # Allow inclusion of third-party code:
-  "+third_party/angle_dx11",
+  "+third_party/angle",
   "+third_party/flac",
   "+third_party/libjingle",
   "+third_party/mozilla",

content/browser/gpu/gpu_internals_ui.cc

@@ -28,7 +28,7 @@
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
 #include "grit/content_resources.h"
-#include "third_party/angle_dx11/src/common/version.h"
+#include "third_party/angle/src/common/version.h"
 
 namespace content {
 namespace {

content/content_gpu.gypi

@@ -26,12 +26,12 @@
     ['OS=="win"', {
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
-        '<(DEPTH)/third_party/angle_dx11/src',
+        '<(angle_path)/src',
         '<(DEPTH)/third_party/wtl/include',
       ],
       'dependencies': [
-        '../third_party/angle_dx11/src/build_angle.gyp:libEGL',
-        '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2',
+        '<(angle_path)/src/build_angle.gyp:libEGL',
+        '<(angle_path)/src/build_angle.gyp:libGLESv2',
       ],
       'link_settings': {
         'libraries': [

content/content_tests.gypi

@@ -1261,8 +1261,8 @@
               }],
               ['OS=="win"', {
                 'dependencies': [
-                  '../third_party/angle_dx11/src/build_angle.gyp:libEGL',
-                  '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2',
+                  '<(angle_path)/src/build_angle.gyp:libEGL',
+                  '<(angle_path)/src/build_angle.gyp:libGLESv2',
                 ],
               }],
               ['(OS=="win" and win_use_allocator_shim==1) or '

gpu/DEPS

@@ -1,6 +1,6 @@
 include_rules = [
   "+native_client/src/include",
-  "+third_party/angle_dx11",
+  "+third_party/angle",
   "+third_party/amd",
   "+third_party/re2",
   "+third_party/smhasher",

gpu/angle_unittest_main.cc

@@ -6,7 +6,7 @@
 #include "base/command_line.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h"
+#include "third_party/angle/include/GLSLANG/ShaderLang.h"
 
 int main(int argc, char** argv) {
   // On Android, AtExitManager is created in

gpu/command_buffer/service/shader_translator.h

@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "gpu/gpu_export.h"
-#include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h"
+#include "third_party/angle/include/GLSLANG/ShaderLang.h"
 
 namespace gpu {
 namespace gles2 {

gpu/command_buffer/service/shader_translator_cache.h

@@ -12,7 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "gpu/command_buffer/service/shader_translator.h"
-#include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h"
+#include "third_party/angle/include/GLSLANG/ShaderLang.h"
 
 namespace gpu {
 namespace gles2 {

gpu/command_buffer_service.gypi

@@ -18,7 +18,7 @@
     '../ui/gfx/gfx.gyp:gfx',
     '../ui/gl/gl.gyp:gl',
     '../ui/ui.gyp:ui',
-    '../third_party/angle_dx11/src/build_angle.gyp:translator',
+    '<(angle_path)/src/build_angle.gyp:translator',
     '../third_party/khronos/khronos.gyp:khronos_headers',
     '../third_party/protobuf/protobuf.gyp:protobuf_lite',
     '../third_party/smhasher/smhasher.gyp:cityhash',

gpu/gpu.gyp

@@ -127,21 +127,21 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/angle_dx11/src/build_angle.gyp:translator_static',
+        '<(angle_path)/src/build_angle.gyp:translator_static',
       ],
       'variables': {
-        'ANGLE_DIR': '../third_party/angle_dx11',
+        'ANGLE_DIR': '<(angle_path)',
       },
       'includes': [
-        '../third_party/angle_dx11/tests/preprocessor_tests/preprocessor_tests.gypi',
-        '../third_party/angle_dx11/tests/compiler_tests/compiler_tests.gypi',
+        '../third_party/angle/tests/preprocessor_tests/preprocessor_tests.gypi',
+        '../third_party/angle/tests/compiler_tests/compiler_tests.gypi',
       ],
       'include_dirs': [
         '..',
-        '../third_party/angle_dx11/include',
-        '../third_party/angle_dx11/src',
-        '../third_party/angle_dx11/src/compiler/preprocessor',
-        '../third_party/angle_dx11/tests',
+        '<(angle_path)/include',
+        '<(angle_path)/src',
+        '<(angle_path)/src/compiler/preprocessor',
+        '<(angle_path)/tests',
       ],
       'sources': [
         'angle_unittest_main.cc',
@@ -156,7 +156,7 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/angle_dx11/src/build_angle.gyp:translator',
+        '<(angle_path)/src/build_angle.gyp:translator',
         '../ui/gl/gl.gyp:gl',
         '../ui/gfx/gfx.gyp:gfx',
         'command_buffer/command_buffer.gyp:gles2_utils',
@@ -280,7 +280,7 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/angle_dx11/src/build_angle.gyp:translator',
+        '<(angle_path)/src/build_angle.gyp:translator',
         '../ui/gfx/gfx.gyp:gfx',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'command_buffer_client',

tools/bisect-perf-regression.py

@@ -80,8 +80,8 @@
     'viewvc': 'http://src.chromium.org/viewvc/blink?view=revision&revision='
   },
   'angle' : {
-    "src" : "src/third_party/angle_dx11",
-    "src_old" : "src/third_party/angle",
+    "src" : "src/third_party/angle",
+    "src_old" : "src/third_party/angle_dx11",
     "recurse" : True,
     "depends" : None,
     "from" : ['chromium'],

webkit/DEPS

@@ -11,7 +11,7 @@ include_rules = [
   "+cc",
   "+grit",  # For generated headers
   "+skia",
-  "+third_party/angle_dx11",
+  "+third_party/angle",
   "+third_party/hyphen",
   "+third_party/leveldatabase",
   "+third_party/skia",

webkit/common/gpu/webkit_gpu.gyp

@@ -24,7 +24,7 @@
             '<(DEPTH)/gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
             '<(DEPTH)/skia/skia.gyp:skia',
             '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
-            '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
+            '<(angle_path)/src/build_angle.gyp:translator',
             '<(DEPTH)/ui/gl/gl.gyp:gl',
             '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
           ],