summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sql/sql.gyp19
-rw-r--r--sql/sql_unittests_apk.isolate23
2 files changed, 42 insertions, 0 deletions
diff --git a/sql/sql.gyp b/sql/sql.gyp
index 018b287..115a93b 100644
--- a/sql/sql.gyp
+++ b/sql/sql.gyp
@@ -139,6 +139,25 @@
'includes': [ '../build/apk_test.gypi' ],
},
],
+ 'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'sql_unittests_apk_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'sql_unittests_apk',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'sql_unittests_apk.isolate',
+ ],
+ },
+ ]
+ }],
+ ]
}],
['test_isolation_mode != "noop"', {
'targets': [
diff --git a/sql/sql_unittests_apk.isolate b/sql/sql_unittests_apk.isolate
new file mode 100644
index 0000000..7788b5c
--- /dev/null
+++ b/sql/sql_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',
+ 'sql_unittests.isolate',
+ ],
+ 'variables': {
+ 'command': [
+ '<(PRODUCT_DIR)/bin/run_sql_unittests',
+ ],
+ 'files': [
+ '../base/base.isolate',
+ '../build/config/',
+ '../third_party/icu/icu.isolate',
+ '../third_party/instrumented_libraries/instrumented_libraries.isolate',
+ '<(PRODUCT_DIR)/bin/run_sql_unittests',
+ '<(PRODUCT_DIR)/sql_unittests_apk/',
+ 'sql_unittests.isolate',
+ ]
+ },
+}