diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 01:42:52 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 01:42:52 +0000 |
| commit | 476035dd55c983f9c63ba5ab4a68d24bf2fedbb8 (patch) | |
| tree | ee5ffef55b9b808206c6f044663fcc6b8855c938 /content/content_common.gypi | |
| parent | 212a2e45865b81b1bb34b2a4b06d2f16fe4febfc (diff) | |
| download | chromium_src-476035dd55c983f9c63ba5ab4a68d24bf2fedbb8.zip chromium_src-476035dd55c983f9c63ba5ab4a68d24bf2fedbb8.tar.gz chromium_src-476035dd55c983f9c63ba5ab4a68d24bf2fedbb8.tar.bz2 | |
re-land r100988 (gpy refactoring for content dll).
TBR=darin
BUG=
TEST=
Review URL: http://codereview.chromium.org/7889027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
| -rw-r--r-- | content/content_common.gypi | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index 2aa7cb7..9e091d8 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -3,10 +3,7 @@ # found in the LICENSE file. { - 'targets': [ - { - 'target_name': 'content_common', - 'type': 'static_library', + # TODO(dpranke): Fix indentation. 'dependencies': [ '../base/base.gyp:base', '../gpu/gpu.gyp:gpu_ipc', @@ -324,29 +321,4 @@ }, }], ], - }, - ], - - 'conditions': [ - ['target_arch=="arm"', { - 'targets': [ - { - 'target_name': 'omx_video_decode_accelerator_unittest', - 'type': 'executable', - 'dependencies': [ - 'content_common', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '<(DEPTH)/third_party/angle/include', - '<(DEPTH)/third_party/openmax/il', - ], - 'sources': [ - 'common/gpu/media/omx_video_decode_accelerator_unittest.cc', - ], - } - ], - }, - ], - ], } |