diff options
| author | stip <stip@chromium.org> | 2015-10-03 19:23:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-04 02:23:46 +0000 |
| commit | 5a3d2b6cd5bad05c14c4f724b6fd3cced3b5e31b (patch) | |
| tree | caf53247f64dc6c32b48c8bdfbf515dba4aa78b4 | |
| parent | 72e31567bbd1672142b93e6070eb6e34caf31d37 (diff) | |
| download | chromium_src-5a3d2b6cd5bad05c14c4f724b6fd3cced3b5e31b.zip chromium_src-5a3d2b6cd5bad05c14c4f724b6fd3cced3b5e31b.tar.gz chromium_src-5a3d2b6cd5bad05c14c4f724b6fd3cced3b5e31b.tar.bz2 | |
Isolate media_unittests_apk.
BUG=525873
Review URL: https://codereview.chromium.org/1388563003
Cr-Commit-Position: refs/heads/master@{#352268}
| -rw-r--r-- | media/media.gyp | 21 | ||||
| -rw-r--r-- | media/media_unittests_apk.isolate | 23 |
2 files changed, 44 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index 5a462e6..614724f 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1927,6 +1927,27 @@ 'includes': [ '../build/android/java_cpp_enum.gypi' ], }, ], + 'conditions': [ + ['test_isolation_mode != "noop"', + { + 'targets': [ + { + 'target_name': 'media_unittests_apk_run', + 'type': 'none', + 'dependencies': [ + 'media_unittests_apk', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'media_unittests_apk.isolate', + ], + }, + ], + }, + ], + ], }], ['media_use_ffmpeg==1', { 'targets': [ diff --git a/media/media_unittests_apk.isolate b/media/media_unittests_apk.isolate new file mode 100644 index 0000000..6ddeba8 --- /dev/null +++ b/media/media_unittests_apk.isolate @@ -0,0 +1,23 @@ +# Copyright 2015 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. +{ + 'includes': [ + '../build/android/android.isolate', + 'media_unittests.isolate', + ], + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/bin/run_media_unittests', + ], + 'files': [ + '../base/base.isolate', + '../build/config/', + '../third_party/icu/icu.isolate', + '../third_party/instrumented_libraries/instrumented_libraries.isolate', + '<(PRODUCT_DIR)/bin/run_media_unittests', + '<(PRODUCT_DIR)/media_unittests_apk/', + 'media_unittests.isolate', + ] + }, +} |