summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cc/cc_tests.gyp19
-rw-r--r--cc/cc_unittests_apk.isolate18
2 files changed, 37 insertions, 0 deletions
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index c75f93b..44c54d0 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -464,6 +464,25 @@
'includes': [ '../build/apk_test.gypi' ],
},
],
+ 'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'cc_unittests_apk_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'cc_unittests_apk',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'cc_unittests_apk.isolate',
+ ],
+ }
+ ]
+ }]
+ ]
}
],
['test_isolation_mode != "noop"', {
diff --git a/cc/cc_unittests_apk.isolate b/cc/cc_unittests_apk.isolate
new file mode 100644
index 0000000..dd51512
--- /dev/null
+++ b/cc/cc_unittests_apk.isolate
@@ -0,0 +1,18 @@
+# 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',
+ ],
+ 'variables': {
+ 'command': [
+ '<(PRODUCT_DIR)/bin/run_cc_unittests',
+ '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats'
+ ],
+ 'files': [
+ '<(PRODUCT_DIR)/bin/run_cc_unittests',
+ '<(PRODUCT_DIR)/cc_unittests_apk/',
+ ]
+ },
+}