| Index: cc/cc_tests.gyp
|
| diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
|
| index 8b724e7d49138a8002dbdf4d693d3021d1013333..c710cd492a950ba616aa1e44be956f165699ad79 100644
|
| --- a/cc/cc_tests.gyp
|
| +++ b/cc/cc_tests.gyp
|
| @@ -86,7 +86,7 @@
|
| 'targets': [
|
| {
|
| 'target_name': 'cc_unittests',
|
| - 'type': 'executable',
|
| + 'type': '<(gtest_target_type)',
|
| 'dependencies': [
|
| '../base/base.gyp:test_support_base',
|
| '../testing/gtest.gyp:gtest',
|
| @@ -116,6 +116,13 @@
|
| 'sources': [
|
| '<@(cc_tests_source_files)',
|
| ],
|
| + 'conditions': [
|
| + ['OS == "android" and gtest_target_type == "shared_library"', {
|
| + 'dependencies': [
|
| + '../testing/android/native_test.gyp:native_test_native_code',
|
| + ],
|
| + }],
|
| + ],
|
| }],
|
| ],
|
| },
|
| @@ -154,6 +161,23 @@
|
| ],
|
| },
|
| ],
|
| + 'conditions': [
|
| + ['OS == "android" and gtest_target_type == "shared_library"', {
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'cc_unittests_apk',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + 'cc_unittests',
|
| + ],
|
| + 'variables': {
|
| + 'test_suite_name': 'cc_unittests',
|
| + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_unittests<(SHARED_LIB_SUFFIX)',
|
| + },
|
| + 'includes': [ '../build/apk_test.gypi' ],
|
| + }],
|
| + }],
|
| + ],
|
| }],
|
| ],
|
| }
|
|
|