Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(514)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/modules.gyp

Issue 1882963003: Add isolate files for Android tests (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/api/peerconnection_unittests_apk.isolate ('K') | « webrtc/modules/audio_decoder_unittests_apk.isolate ('k') | webrtc/modules/modules_tests_apk.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/modules.gyp
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index d5df8539051741d514a5c0e4aa2df84247f9eb27..9840cfcfecd69df783be40d90c901e48e43ab39f 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -626,10 +626,17 @@
['OS=="android"', {
'targets': [
{
- 'target_name': 'modules_unittests_apk_target',
+ 'target_name': 'audio_codec_speed_tests_apk_target',
'type': 'none',
'dependencies': [
- '<(apk_tests_path):modules_unittests_apk',
+ '<(apk_tests_path):audio_codec_speed_tests_apk',
+ ],
+ },
+ {
+ 'target_name': 'audio_decoder_unittests_apk_target',
+ 'type': 'none',
+ 'dependencies': [
+ '<(apk_tests_path):audio_decoder_unittests_apk',
],
},
{
@@ -639,8 +646,75 @@
'<(apk_tests_path):modules_tests_apk',
],
},
+ {
+ 'target_name': 'modules_unittests_apk_target',
+ 'type': 'none',
+ 'dependencies': [
+ '<(apk_tests_path):modules_unittests_apk',
+ ],
+ },
],
- }],
+ 'conditions': [
+ ['test_isolation_mode != "noop"',
+ {
+ 'targets': [
+ {
+ 'target_name': 'audio_codec_speed_tests_apk_run',
+ 'type': 'none',
+ 'dependencies': [
+ '<(apk_tests_path):audio_codec_speed_tests_apk',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'audio_codec_speed_tests_apk.isolate',
+ ],
+ },
+ {
+ 'target_name': 'audio_decoder_unittests_apk_run',
+ 'type': 'none',
+ 'dependencies': [
+ '<(apk_tests_path):audio_decoder_unittests_apk',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'audio_decoder_unittests_apk.isolate',
+ ],
+ },
+ {
+ 'target_name': 'modules_tests_apk_run',
+ 'type': 'none',
+ 'dependencies': [
+ '<(apk_tests_path):modules_tests_apk',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'modules_tests_apk.isolate',
+ ],
+ },
+ {
+ 'target_name': 'modules_unittests_apk_run',
+ 'type': 'none',
+ 'dependencies': [
+ '<(apk_tests_path):modules_unittests_apk',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'modules_unittests_apk.isolate',
+ ],
+ },
+ ],
+ },
+ ],
+ ],
+ }], # OS=="android"
['test_isolation_mode != "noop"', {
'targets': [
{
« webrtc/api/peerconnection_unittests_apk.isolate ('K') | « webrtc/modules/audio_decoder_unittests_apk.isolate ('k') | webrtc/modules/modules_tests_apk.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698