| Index: webrtc/system_wrappers/system_wrappers_tests.gyp
|
| diff --git a/webrtc/system_wrappers/system_wrappers_tests.gyp b/webrtc/system_wrappers/system_wrappers_tests.gyp
|
| index 863818b1bf5361dcc327f1f144828f48e2699f2e..174c96c948fae8fc62c003c8b7c895a4147380f3 100644
|
| --- a/webrtc/system_wrappers/system_wrappers_tests.gyp
|
| +++ b/webrtc/system_wrappers/system_wrappers_tests.gyp
|
| @@ -56,7 +56,7 @@
|
| },
|
| ],
|
| 'conditions': [
|
| - ['include_tests==1 and OS=="android"', {
|
| + ['OS=="android"', {
|
| 'targets': [
|
| {
|
| 'target_name': 'system_wrappers_unittests_apk_target',
|
| @@ -66,7 +66,28 @@
|
| ],
|
| },
|
| ],
|
| - }],
|
| + 'conditions': [
|
| + ['test_isolation_mode != "noop"',
|
| + {
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'system_wrappers_unittests_apk_run',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + '<(apk_tests_path):system_wrappers_unittests_apk',
|
| + ],
|
| + 'includes': [
|
| + '../build/isolate.gypi',
|
| + ],
|
| + 'sources': [
|
| + 'system_wrappers_unittests_apk.isolate',
|
| + ],
|
| + },
|
| + ],
|
| + },
|
| + ],
|
| + ],
|
| + }], # OS=="android"
|
| ['test_isolation_mode != "noop"', {
|
| 'targets': [
|
| {
|
|
|