diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 23:15:22 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 23:15:22 +0000 |
| commit | e9bef4b67e092282cf1110ea4ede6226b43c681a (patch) | |
| tree | d757c7851c5afe1cd3e3b995da6260a62bed9d66 /content/content_tests.gypi | |
| parent | 6999b82325159ea1650f837a62428bd4fa7a33d1 (diff) | |
| download | chromium_src-e9bef4b67e092282cf1110ea4ede6226b43c681a.zip chromium_src-e9bef4b67e092282cf1110ea4ede6226b43c681a.tar.gz chromium_src-e9bef4b67e092282cf1110ea4ede6226b43c681a.tar.bz2 | |
This change merges all of the content code into a single library; the contents of the library are pulled from individual gypis that are now just collections of settings.
There are three changes here ...
1) Move omx_video_decode_unittest into content_tests.gypi, and move a couple of other definitions into the top level content.gyp
2) Change all of the dependencies in the chrome gypi's from content_browser et al. to just "content"
3) Remove the "targets", "target_name", and "target_type" keys from the content_* gypis
This change depends on http://codereview.chromium.org/7697008/ landing first to ensure we have the right dependencies set for content.
BUG=90442
TEST=everything still compiles and links
Review URL: http://codereview.chromium.org/7618029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
| -rw-r--r-- | content/content_tests.gypi | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 92c0bcb..fb1f4e0 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -172,4 +172,26 @@ ], }, ], + 'conditions': [ + ['target_arch=="arm"', { + 'targets': [ + { + 'target_name': 'omx_video_decode_accelerator_unittest', + 'type': 'executable', + 'dependencies': [ + 'content', + '../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', + ], + } + ], + }, + ], + ], } |