| Index: android_webview/android_webview_tests.gypi
|
| diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
|
| index b4b4a805e498d48d7a9bfe5ee8786385b200c0c1..979edfcb42a913f5b6fbe3033fa693b9b6dbeff0 100644
|
| --- a/android_webview/android_webview_tests.gypi
|
| +++ b/android_webview/android_webview_tests.gypi
|
| @@ -31,6 +31,7 @@
|
| 'type': '<(gtest_target_type)',
|
| 'dependencies': [
|
| '../base/base.gyp:test_support_base',
|
| + '../net/net.gyp:net_test_support',
|
| '../testing/android/native_test.gyp:native_test_native_code',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| @@ -39,21 +40,52 @@
|
| 'include_dirs': [
|
| '..',
|
| '../skia/config',
|
| + '<(SHARED_INTERMEDIATE_DIR)/android_webview_unittests',
|
| ],
|
| 'sources': [
|
| 'lib/main/webview_tests.cc',
|
| - 'native/android_stream_reader_url_request_job_unittests.cc',
|
| + 'native/android_stream_reader_url_request_job_unittest.cc',
|
| + 'native/input_stream_reader_unittest.cc',
|
| + 'native/input_stream_unittest.cc',
|
| ],
|
| },
|
| {
|
| + 'target_name': 'android_webview_unittest_java',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + '../base/base.gyp:base_java_test_support',
|
| + '../content/content.gyp:content_java_test_support',
|
| + 'android_webview_java',
|
| + ],
|
| + 'variables': {
|
| + 'package_name': 'android_webview_unittest_java',
|
| + 'java_in_dir': '../android_webview/unittestjava',
|
| + },
|
| + 'includes': [ '../build/java.gypi' ],
|
| + },
|
| + {
|
| + 'target_name': 'android_webview_unittests_jni',
|
| + 'type': 'none',
|
| + 'sources': [
|
| + '../android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java',
|
| + ],
|
| + 'variables': {
|
| + 'jni_gen_dir': 'android_webview_unittests',
|
| + },
|
| + 'includes': [ '../build/jni_generator.gypi' ],
|
| + },
|
| + {
|
| 'target_name': 'android_webview_unittests_apk',
|
| 'type': 'none',
|
| 'dependencies': [
|
| + 'android_webview_unittest_java',
|
| 'android_webview_unittests',
|
| + 'android_webview_unittests_jni',
|
| ],
|
| 'variables': {
|
| 'test_suite_name': 'android_webview_unittests',
|
| 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)android_webview_unittests<(SHARED_LIB_SUFFIX)',
|
| + 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_unittest_java.jar'],
|
| },
|
| 'includes': [ '../build/apk_test.gypi' ],
|
| },
|
|
|