diff options
author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 21:11:29 +0000 |
---|---|---|
committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 21:11:29 +0000 |
commit | 54f8747d6057a3e794e1c24c3246c7d6c580db3f (patch) | |
tree | d72d287d49387521829c85355911eb449a9ef3b0 /content/content_gpu.gypi | |
parent | e44df4bd50372d562731300d039f8d22029d8548 (diff) | |
download | chromium_src-54f8747d6057a3e794e1c24c3246c7d6c580db3f.zip chromium_src-54f8747d6057a3e794e1c24c3246c7d6c580db3f.tar.gz chromium_src-54f8747d6057a3e794e1c24c3246c7d6c580db3f.tar.bz2 |
fix indentation in content_*.gypi.
This is a whitespace-only change to clean up from the refactoring of a
couple weeks ago for the component build.
R=jam@chromium.org
BUG=90442
TEST=none
Review URL: http://codereview.chromium.org/8046015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_gpu.gypi')
-rw-r--r-- | content/content_gpu.gypi | 151 |
1 files changed, 75 insertions, 76 deletions
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index 5d89a61..9714ae4 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -3,86 +3,85 @@ # found in the LICENSE file. { - # TODO(dpranke): Fix indentation. - 'dependencies': [ - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - '../ui/gfx/gl/gl.gyp:gl', - ], - 'sources': [ - 'gpu/gpu_dx_diagnostics_win.cc', - 'gpu/gpu_info_collector_linux.cc', - 'gpu/gpu_info_collector_mac.mm', - 'gpu/gpu_info_collector_win.cc', - 'gpu/gpu_info_collector.cc', - 'gpu/gpu_info_collector.h', - 'gpu/gpu_main.cc', - 'gpu/gpu_process.cc', - 'gpu/gpu_process.h', - 'gpu/gpu_child_thread.cc', - 'gpu/gpu_child_thread.h', - 'gpu/gpu_watchdog_thread.cc', - 'gpu/gpu_watchdog_thread.h', - ], + 'dependencies': [ + '../base/base.gyp:base', + '../skia/skia.gyp:skia', + '../ui/gfx/gl/gl.gyp:gl', + ], + 'sources': [ + 'gpu/gpu_dx_diagnostics_win.cc', + 'gpu/gpu_info_collector_linux.cc', + 'gpu/gpu_info_collector_mac.mm', + 'gpu/gpu_info_collector_win.cc', + 'gpu/gpu_info_collector.cc', + 'gpu/gpu_info_collector.h', + 'gpu/gpu_main.cc', + 'gpu/gpu_process.cc', + 'gpu/gpu_process.h', + 'gpu/gpu_child_thread.cc', + 'gpu/gpu_child_thread.h', + 'gpu/gpu_watchdog_thread.cc', + 'gpu/gpu_watchdog_thread.h', + ], + 'include_dirs': [ + '..', + ], + 'conditions': [ + ['OS=="win"', { 'include_dirs': [ - '..', + '<(DEPTH)/third_party/angle/include', + '<(DEPTH)/third_party/angle/src', + '<(DEPTH)/third_party/wtl/include', + '$(DXSDK_DIR)/include', + ], + 'dependencies': [ + '../third_party/angle/src/build_angle.gyp:libEGL', + '../third_party/angle/src/build_angle.gyp:libGLESv2', ], - 'conditions': [ - ['OS=="win"', { - 'include_dirs': [ - '<(DEPTH)/third_party/angle/include', - '<(DEPTH)/third_party/angle/src', - '<(DEPTH)/third_party/wtl/include', - '$(DXSDK_DIR)/include', + }], + ['OS=="win" and directxsdk_exists=="True"', { + 'actions': [ + { + 'action_name': 'extract_d3dx9', + 'variables': { + 'input': 'Jun2010_d3dx9_43_x86.cab', + 'output': 'd3dx9_43.dll', + }, + 'inputs': [ + '../third_party/directxsdk/files/Redist/<(input)', + ], + 'outputs': [ + '<(PRODUCT_DIR)/<(output)', + ], + 'action': [ + 'python', + '../build/extract_from_cab.py', + '..\\third_party\\directxsdk\\files\\Redist\\<(input)', + '<(output)', + '<(PRODUCT_DIR)', + ], + }, + { + 'action_name': 'extract_d3dcompiler', + 'variables': { + 'input': 'Jun2010_D3DCompiler_43_x86.cab', + 'output': 'D3DCompiler_43.dll', + }, + 'inputs': [ + '../third_party/directxsdk/files/Redist/<(input)', ], - 'dependencies': [ - '../third_party/angle/src/build_angle.gyp:libEGL', - '../third_party/angle/src/build_angle.gyp:libGLESv2', + 'outputs': [ + '<(PRODUCT_DIR)/<(output)', ], - }], - ['OS=="win" and directxsdk_exists=="True"', { - 'actions': [ - { - 'action_name': 'extract_d3dx9', - 'variables': { - 'input': 'Jun2010_d3dx9_43_x86.cab', - 'output': 'd3dx9_43.dll', - }, - 'inputs': [ - '../third_party/directxsdk/files/Redist/<(input)', - ], - 'outputs': [ - '<(PRODUCT_DIR)/<(output)', - ], - 'action': [ - 'python', - '../build/extract_from_cab.py', - '..\\third_party\\directxsdk\\files\\Redist\\<(input)', - '<(output)', - '<(PRODUCT_DIR)', - ], - }, - { - 'action_name': 'extract_d3dcompiler', - 'variables': { - 'input': 'Jun2010_D3DCompiler_43_x86.cab', - 'output': 'D3DCompiler_43.dll', - }, - 'inputs': [ - '../third_party/directxsdk/files/Redist/<(input)', - ], - 'outputs': [ - '<(PRODUCT_DIR)/<(output)', - ], - 'action': [ - 'python', - '../build/extract_from_cab.py', - '..\\third_party\\directxsdk\\files\\Redist\\<(input)', - '<(output)', - '<(PRODUCT_DIR)', - ], - }, + 'action': [ + 'python', + '../build/extract_from_cab.py', + '..\\third_party\\directxsdk\\files\\Redist\\<(input)', + '<(output)', + '<(PRODUCT_DIR)', ], - }], + }, ], + }], + ], } |