diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:35:36 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:35:36 +0000 |
| commit | c137498b90a2e65281411d233a3d86533c365a74 (patch) | |
| tree | b72f8070c99b5ec82a2b4356906eba55235d0a3e /build | |
| parent | 7c7723c7f90df28d97e345b09a51811b99e3e5d2 (diff) | |
| download | chromium_src-c137498b90a2e65281411d233a3d86533c365a74.zip chromium_src-c137498b90a2e65281411d233a3d86533c365a74.tar.gz chromium_src-c137498b90a2e65281411d233a3d86533c365a74.tar.bz2 | |
Revert 53076 - 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
TBR=apatrick@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/dir_exists.py | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/build/all.gyp b/build/all.gyp index 715eb8d..f8207b4 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -26,7 +26,6 @@ '../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:*', @@ -265,6 +264,7 @@ '../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 deleted file mode 100644 index d1c194f..0000000 --- a/build/dir_exists.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/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) |