diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 20:29:14 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 20:29:14 +0000 |
| commit | bfa00d17d77105708552ad6446d1c9604f2f094b (patch) | |
| tree | 7b6d80b93d7b95e2a765a0ae455b50f667602f5f /media/media.gyp | |
| parent | 49b719e480ec83da8b36309cc32eac295f95fef2 (diff) | |
| download | chromium_src-bfa00d17d77105708552ad6446d1c9604f2f094b.zip chromium_src-bfa00d17d77105708552ad6446d1c9604f2f094b.tar.gz chromium_src-bfa00d17d77105708552ad6446d1c9604f2f094b.tar.bz2 | |
Add APK target for media_unittests.
On Android unittests are run in APKs.
BUG=137131
TEST=
Review URL: https://chromiumcodereview.appspot.com/10736057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/media/media.gyp b/media/media.gyp index d0f889b..d4995d8 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -638,7 +638,7 @@ }, { 'target_name': 'media_unittests', - 'type': 'executable', + 'type': '<(gtest_target_type)', 'dependencies': [ 'media', 'media_test_support', @@ -725,12 +725,7 @@ }], ], }], - ['OS != "android"', { - 'dependencies': [ - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', - ], - }], - ['OS == "android"', { + ['OS=="android"', { 'sources!': [ 'audio/audio_input_volume_unittest.cc', 'base/test_data_util.cc', @@ -747,6 +742,17 @@ 'mp4/mp4_stream_parser_unittest.cc', 'webm/webm_cluster_parser_unittest.cc', ], + 'conditions': [ + ['gtest_target_type == "shared_library"', { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + }], + ], + }, { # OS!=android + 'dependencies': [ + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', + ], }], ['OS == "linux"', { 'conditions': [ @@ -974,6 +980,30 @@ }, ], }], + # Special target to wrap a gtest_target_type==shared_library + # media_unittests into an android apk for execution. + ['OS == "android" and gtest_target_type == "shared_library"', { + 'targets': [ + { + 'target_name': 'media_unittests_apk', + 'type': 'none', + 'dependencies': [ + '../base/base.gyp:base_java', + 'media_java', + 'media_unittests', + ], + 'variables': { + 'test_suite_name': 'media_unittests', + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)media_unittests<(SHARED_LIB_SUFFIX)', + 'input_jars_paths': [ + '<(PRODUCT_DIR)/lib.java/chromium_base.jar', + '<(PRODUCT_DIR)/lib.java/chromium_media.jar', + ], + }, + 'includes': [ '../build/apk_test.gypi' ], + }, + ], + }], ['OS == "android"', { 'targets': [ { |