| Index: content/content_tests.gypi
|
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi
|
| index b20910156a3d8691a59682775e05d7777172e07d..288c5146b96a03ac9f787e58f99861b04e1378fb 100644
|
| --- a/content/content_tests.gypi
|
| +++ b/content/content_tests.gypi
|
| @@ -789,6 +789,37 @@
|
| }],
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'content_android_linker_unittests',
|
| + 'type': '<(gtest_target_type)',
|
| + 'defines!': ['CONTENT_IMPLEMENTATION'],
|
| + 'dependencies': [
|
| + 'content_browser',
|
| + 'content_common',
|
| + 'test_support_content',
|
| + '../base/base.gyp:test_support_base',
|
| + '../testing/gmock.gyp:gmock',
|
| + '../testing/gtest.gyp:gtest',
|
| + ],
|
| + 'include_dirs': [
|
| + '..',
|
| + ],
|
| + 'sources': [
|
| + 'test/run_all_unittests.cc',
|
| + ],
|
| + 'conditions': [
|
| + ['OS=="android"', {
|
| + 'sources': [
|
| + 'test/content_android_linker_unittest.cc',
|
| + ],
|
| + }],
|
| + ['OS == "android" and gtest_target_type == "shared_library"', {
|
| + 'dependencies': [
|
| + '../testing/android/native_test.gyp:native_test_native_code',
|
| + ],
|
| + }],
|
| + ],
|
| + }
|
| ],
|
| 'conditions': [
|
| ['OS!="ios"', {
|
| @@ -1258,6 +1289,23 @@
|
| 'includes': [ '../build/apk_test.gypi' ],
|
| },
|
| {
|
| + 'target_name': 'content_android_linker_unittests_apk',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + 'content_android_linker_unittests',
|
| + 'content_java',
|
| + 'content_java_test_support',
|
| + 'content_shell_java',
|
| + ],
|
| + 'variables': {
|
| + 'test_suite_name': 'content_android_linker_unittests',
|
| + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_android_linker_unittests<(SHARED_LIB_SUFFIX)',
|
| + 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
|
| + 'use_chrome_linker': '1',
|
| + },
|
| + 'includes': [ '../build/apk_test.gypi' ],
|
| + },
|
| + {
|
| 'target_name': 'content_browsertests_apk',
|
| 'type': 'none',
|
| 'dependencies': [
|
|
|