| Index: Source/wtf/wtf_tests.gyp
|
| diff --git a/Source/wtf/wtf_tests.gyp b/Source/wtf/wtf_tests.gyp
|
| index 92daeaaf40ed350ae22fb1b75a8fc466c69b2a57..c013797f13616d81ca0a4e16a3fff8501b5b319b 100644
|
| --- a/Source/wtf/wtf_tests.gyp
|
| +++ b/Source/wtf/wtf_tests.gyp
|
| @@ -51,7 +51,14 @@
|
| '<(DEPTH)/base/base.gyp:base',
|
| '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| ],
|
| - }]
|
| + }],
|
| + ['OS=="android" and gtest_target_type == "shared_library"', {
|
| + 'type': 'shared_library',
|
| + 'dependencies': [
|
| + '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
|
| + '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2',
|
| + ],
|
| + }],
|
| ]
|
| },
|
| {
|
| @@ -85,4 +92,21 @@
|
| ],
|
| },
|
| ],
|
| + 'conditions': [
|
| + ['OS=="android" and android_webview_build==0 and gtest_target_type=="shared_library"', {
|
| + 'targets': [{
|
| + 'target_name': 'wtf_unittests_apk',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + '<(DEPTH)/base/base.gyp:base_java',
|
| + '<(DEPTH)/net/net.gyp:net_java',
|
| + 'wtf_unittests',
|
| + ],
|
| + 'variables': {
|
| + 'test_suite_name': 'wtf_unittests',
|
| + },
|
| + 'includes': [ '../../../../build/apk_test.gypi' ],
|
| + }],
|
| + }],
|
| + ],
|
| }
|
|
|