GYP changed to extract D3DX9 DLL into product dir.

This is so ANGLE will find it.

Also added ANGLE as a Chrome dependency.

There must be a better way to detect whether there is a directxsdk directory in third_party. I'm open to ideas.

TEST=try, check d3dx9 is copied to product dir when building chrome, check ANGLE initializes
BUG=45898

Review URL: http://codereview.chromium.org/2843060

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

3 files changed, 39 insertions, 1 deletions

diff --git a/build/all.gyp b/build/all.gyp
index f8207b4..715eb8d 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -26,6 +26,7 @@
         '../skia/skia.gyp:*',
         '../testing/gmock.gyp:*',
         '../testing/gtest.gyp:*',
+        '../third_party/angle/src/build_angle.gyp:*',
         '../third_party/bzip2/bzip2.gyp:*',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
         '../third_party/cld/cld.gyp:*',
@@ -264,7 +265,6 @@
             '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
-            '../third_party/angle/src/build_angle.gyp:*',
           ],
         },
         {
diff --git a/build/dir_exists.py b/build/dir_exists.py
new file mode 100644
index 0000000..d1c194f
--- /dev/null
+++ b/build/dir_exists.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os.path
+import sys
+
+sys.stdout.write(str(os.path.isdir(sys.argv[1])))
+sys.exit(0)
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 67c7d5a..4a6a5d3 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -68,6 +68,7 @@
     'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
     # TODO: remove this helper when we have loops in GYP
     'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
+    'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
     'conditions': [
       ['OS=="win"', {
         'nacl_defines': [
@@ -715,6 +716,33 @@
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
+          'dependencies': [
+            '../third_party/angle/src/build_angle.gyp:libEGL',
+            '../third_party/angle/src/build_angle.gyp:libGLESv2',
+          ],
+        }],
+        ['OS=="win" and directxsdk_exists=="True"', {
+          'actions': [
+            {
+              'action_name': 'extract_d3dx9',
+              'variables': {
+                'input': 'Aug2009_d3dx9_42_x86.cab',
+                'output': 'd3dx9_42.dll',
+              },
+              'inputs': [
+                '../third_party/directxsdk/files/Redist/<(input)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/<(output)',
+              ],
+              'action': [
+                'expand',
+                '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
+                '-F:<(output)',
+                '<(PRODUCT_DIR)',
+              ],
+            },
+          ],
         }],
         ['OS=="linux" and target_arch!="arm"', {
           'sources': [