From 2036a7bb4098cfff607b3b9854ed5d2ef03aaa72 Mon Sep 17 00:00:00 2001
From: "andresp@webrtc.org" <andresp@webrtc.org>
Date: Fri, 19 Sep 2014 08:14:12 +0000
Subject: [PATCH] Clean directx_sdk_path as it is already defined in
 base/common.gypi

R=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/23729004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7237 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/modules/video_render/video_render.gypi | 18 +-----------------
 webrtc/test/webrtc_test_common.gyp            | 16 ----------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi
index da51588ae0..5db851d9c6 100644
--- a/webrtc/modules/video_render/video_render.gypi
+++ b/webrtc/modules/video_render/video_render.gypi
@@ -141,23 +141,7 @@
             'windows/video_render_windows_impl.h',
             'windows/video_render_direct3d9.cc',
             'windows/video_render_windows_impl.cc',
-	  ],
-          'variables': {
-            # 'directx_sdk_path' will be overridden in the condition block
-            # below, but it must not be declared as empty here since gyp
-            # will check if the first character is '/' for some reason.
-            # If it's empty, we'll get an out-of-bounds error.
-            'directx_sdk_path': 'will_be_overridden',
-            'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
-            'conditions': [
-              ['"<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_default_path))"=="True"', {
-                'directx_sdk_path': '<(DEPTH)/third_party/directxsdk/files',
-              }, {
-                'directx_sdk_path': '$(DXSDK_DIR)',
-              }],
-            ],
-          },
-
+          ],
           'include_dirs': [
             '<(directx_sdk_path)/Include',
           ],
diff --git a/webrtc/test/webrtc_test_common.gyp b/webrtc/test/webrtc_test_common.gyp
index 71b875d1ba..d422a4b0d3 100644
--- a/webrtc/test/webrtc_test_common.gyp
+++ b/webrtc/test/webrtc_test_common.gyp
@@ -104,22 +104,6 @@
           'sources!': [
             'null_platform_renderer.cc',
           ],
-          'variables': {
-            # 'directx_sdk_path' will be overridden in the condition block
-            # below, but it must not be declared as empty here since gyp
-            # will check if the first character is '/' for some reason.
-            # If it's empty, we'll get an out-of-bounds error.
-            'directx_sdk_path': 'will_be_overridden',
-            'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
-            'conditions': [
-              ['"<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_default_path))"=="True"', {
-                'directx_sdk_path': '<(DEPTH)/third_party/directxsdk/files',
-              }, {
-                'directx_sdk_path': '$(DXSDK_DIR)',
-              }],
-            ],
-          },
-
           'include_dirs': [
             '<(directx_sdk_path)/Include',
           ],