Replace angle_path gyp variable with regular path.

The switch to angle_dx11 is complete. This is cleanup. I will land this before removing the angle_path variable from build/common.gypi. For media/ TBR=vrk@chromium.org Review URL: https://chromiumcodereview.appspot.com/18161007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211908 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jul 17, 2013 · c9248d3 · c9248d3
1 parent d715cae
commit c9248d3
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 31 deletions.
diff --git a/build/all.gyp b/build/all.gyp
@@ -145,7 +145,7 @@
             '../courgette/courgette.gyp:*',
             '../rlz/rlz.gyp:*',
             '../sandbox/sandbox.gyp:*',
-            '<(angle_path)/src/build_angle.gyp:*',
+            '../third_party/angle_dx11/src/build_angle.gyp:*',
             '../third_party/bspatch/bspatch.gyp:*',
             '../third_party/gles2_book/gles2_book.gyp:*',
           ],

diff --git a/content/DEPS b/content/DEPS
@@ -60,7 +60,6 @@ include_rules = [
   "-tools",
 
   # Allow inclusion of third-party code:
-  "+third_party/angle",
   "+third_party/angle_dx11",
   "+third_party/flac",
   "+third_party/gpsd",

diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
@@ -29,13 +29,7 @@
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
 #include "grit/content_resources.h"
-
-
-#if defined(ANGLE_DX11)
 #include "third_party/angle_dx11/src/common/version.h"
-#else
-#include "third_party/angle/src/common/version.h"
-#endif
 
 namespace content {
 namespace {

diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
@@ -24,12 +24,12 @@
     ['OS=="win"', {
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
-        '<(angle_path)/src',
+        '<(DEPTH)/third_party/angle_dx11/src',
         '<(DEPTH)/third_party/wtl/include',
       ],
       'dependencies': [
-        '<(angle_path)/src/build_angle.gyp:libEGL',
-        '<(angle_path)/src/build_angle.gyp:libGLESv2',
+        '../third_party/angle_dx11/src/build_angle.gyp:libEGL',
+        '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2',
       ],
       'link_settings': {
         'libraries': [

diff --git a/content/content_tests.gypi b/content/content_tests.gypi
@@ -1094,8 +1094,8 @@
               }],
               ['OS=="win"', {
                 'dependencies': [
-                  '<(angle_path)/src/build_angle.gyp:libEGL',
-                  '<(angle_path)/src/build_angle.gyp:libGLESv2',
+                  '../third_party/angle_dx11/src/build_angle.gyp:libEGL',
+                  '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2',
                 ],
               }],
               ['(OS=="win" and win_use_allocator_shim==1) or '

diff --git a/gpu/DEPS b/gpu/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+native_client/src/include",
-  "+third_party/angle",
   "+third_party/angle_dx11",
   "+third_party/amd",
   "+third_party/re2",

diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h
@@ -13,12 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "gpu/gpu_export.h"
-
-#if defined(ANGLE_DX11)
 #include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h"
-#else
-#include "third_party/angle/include/GLSLANG/ShaderLang.h"
-#endif
 
 namespace gpu {
 namespace gles2 {

diff --git a/gpu/command_buffer/service/shader_translator_cache.h b/gpu/command_buffer/service/shader_translator_cache.h
@@ -12,12 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "gpu/command_buffer/service/shader_translator.h"
-
-#if defined(ANGLE_DX11)
 #include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h"
-#else
-#include "third_party/angle/include/GLSLANG/ShaderLang.h"
-#endif
 
 namespace gpu {
 namespace gles2 {

diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi
@@ -17,7 +17,7 @@
     '../crypto/crypto.gyp:crypto',
     '../ui/gl/gl.gyp:gl',
     '../ui/ui.gyp:ui',
-    '<(angle_path)/src/build_angle.gyp:translator_glsl',
+    '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
     '../third_party/khronos/khronos.gyp:khronos_headers',
     '../third_party/protobuf/protobuf.gyp:protobuf_lite',
     '../third_party/smhasher/smhasher.gyp:cityhash',

diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
@@ -125,7 +125,7 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '<(angle_path)/src/build_angle.gyp:translator_glsl',
+        '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
         '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
         'command_buffer/command_buffer.gyp:gles2_utils',
@@ -253,7 +253,7 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '<(angle_path)/src/build_angle.gyp:translator_glsl',
+        '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
         '../ui/ui.gyp:ui',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'command_buffer_client',

diff --git a/media/media.gyp b/media/media.gyp
@@ -1383,8 +1383,8 @@
             }],
             ['OS=="win"', {
               'dependencies': [
-                '<(angle_path)/src/build_angle.gyp:libEGL',
-                '<(angle_path)/src/build_angle.gyp:libGLESv2',
+                '../third_party/angle_dx11/src/build_angle.gyp:libEGL',
+                '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2',
               ],
               'sources': [
                 'tools/shader_bench/window_win.cc',

diff --git a/webkit/DEPS b/webkit/DEPS
@@ -11,7 +11,6 @@ include_rules = [
   "+cc",
   "+grit",  # For generated headers
   "+skia",
-  "+third_party/angle",
   "+third_party/angle_dx11",
   "+third_party/hyphen",
   "+third_party/leveldatabase",

diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp
@@ -22,7 +22,7 @@
             '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
             '<(DEPTH)/skia/skia.gyp:skia',
             '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
-            '<(angle_path)/src/build_angle.gyp:translator_glsl',
+            '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
             '<(DEPTH)/ui/gl/gl.gyp:gl',
             '<(DEPTH)/ui/ui.gyp:ui',
           ],