summaryrefslogtreecommitdiffstats
path: root/mojo/mojo.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'mojo/mojo.gyp')
-rw-r--r--mojo/mojo.gyp9
1 files changed, 8 insertions, 1 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index e54f9a4..7a27b57 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -590,7 +590,7 @@
},
{
'target_name': 'mojo_shell_tests',
- 'type': 'executable',
+ 'type': '<(gtest_target_type)',
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
@@ -612,6 +612,13 @@
'shell/shell_test_base_unittest.cc',
'shell/shell_test_main.cc',
],
+ 'conditions': [
+ ['OS == "android"', {
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }],
+ ],
},
{
'target_name': 'mojo_service_manager_unittests',