diff options
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/dir_exists.py | 10 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 28 |
3 files changed, 1 insertions, 39 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) diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 4a6a5d3..67c7d5a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -68,7 +68,6 @@ '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': [ @@ -716,33 +715,6 @@ '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': [ |