Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1941)

Unified Diff: android_webview/android_webview_tests.gypi

Issue 11363123: [android_webview] Don't block the IO thread when reading from an InputStream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/android_webview.gyp ('k') | android_webview/browser/input_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/android_webview_tests.gypi
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index fb9317fbdc96ede9686917bbe6f4d9e3743651a5..2dce67fdec5d5c815b4566d3adc1417c05c3672a 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -33,6 +33,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',
@@ -41,22 +42,53 @@
'include_dirs': [
'..',
'../skia/config',
+ '<(SHARED_INTERMEDIATE_DIR)/android_webview_unittests',
],
'sources': [
+ 'browser/net/android_stream_reader_url_request_job_unittest.cc',
+ 'browser/net/input_stream_reader_unittest.cc',
'lib/main/webview_tests.cc',
- 'native/android_stream_reader_url_request_job_unittests.cc',
+ 'native/input_stream_unittest.cc',
'native/state_serializer_unittests.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' ],
},
« no previous file with comments | « android_webview/android_webview.gyp ('k') | android_webview/browser/input_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698