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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/cronet/android/BUILD.gn

Issue 1412243012: Initial implementation of CronetBidirectionalStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Helen's comments. Created 4 years, 11 months 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 | « components/cronet.gypi ('k') | components/cronet/android/api/src/org/chromium/net/BidirectionalStream.java » ('j') | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index dab63ff1b6703ab8bbca5a4e46f34d437912ed69..5e57f385578c2ab11e3fda66bc3aa2ca219a5778 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/buildflag_header.gni")
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//build/util/version.gni")
@@ -18,6 +19,7 @@ generate_jni("cronet_jni_headers") {
sources = [
"java/src/org/chromium/net/ChromiumUrlRequest.java",
"java/src/org/chromium/net/ChromiumUrlRequestContext.java",
+ "java/src/org/chromium/net/CronetBidirectionalStream.java",
"java/src/org/chromium/net/CronetLibraryLoader.java",
"java/src/org/chromium/net/CronetUploadDataStream.java",
"java/src/org/chromium/net/CronetUrlRequest.java",
@@ -101,6 +103,7 @@ template("cronet_static_tmpl") {
":cronet_jni_headers",
":cronet_url_request_java",
":cronet_version_header",
+ ":features",
"//base",
"//base:i18n",
"//base:prefs",
@@ -156,6 +159,13 @@ template("cronet_static_tmpl") {
]
}
+ if (enable_bidirectional_stream) {
kapishnikov 2016/01/27 21:50:29 We should define the default value for |enable_bid
mef 2016/01/29 00:15:29 Done.
+ sources += [
+ "//components/cronet/android/cronet_bidirectional_stream_adapter.cc",
+ "//components/cronet/android/cronet_bidirectional_stream_adapter.h",
+ ]
+ }
+
if (defined(invoker.defines)) {
defines += invoker.defines
}
@@ -239,6 +249,7 @@ android_library("cronet_java") {
"java/src/org/chromium/net/ChromiumUrlRequest.java",
"java/src/org/chromium/net/ChromiumUrlRequestContext.java",
"java/src/org/chromium/net/ChromiumUrlRequestFactory.java",
+ "java/src/org/chromium/net/CronetBidirectionalStream.java",
"java/src/org/chromium/net/CronetLibraryLoader.java",
"java/src/org/chromium/net/CronetUploadDataStream.java",
"java/src/org/chromium/net/CronetUrlRequest.java",
@@ -401,7 +412,20 @@ android_resources("cronet_test_apk_resources") {
android_library("cronet_test_apk_java") {
testonly = true
- DEPRECATED_java_in_dir = "test/src"
+
+ java_files = [
+ "test/src/org/chromium/net/CronetTestApplication.java",
+ "test/src/org/chromium/net/MockCertVerifier.java",
+ "test/src/org/chromium/net/SdchObserver.java",
+ "test/src/org/chromium/net/CronetTestFramework.java",
+ "test/src/org/chromium/net/MockUrlRequestJobFactory.java",
+ "test/src/org/chromium/net/TestFilesInstaller.java",
+ "test/src/org/chromium/net/CronetTestUtil.java",
+ "test/src/org/chromium/net/NativeTestServer.java",
+ "test/src/org/chromium/net/TestUploadDataStreamHandler.java",
+ "test/src/org/chromium/net/NetworkChangeNotifierUtil.java",
+ "test/src/org/chromium/net/QuicTestServer.java",
+ ]
deps = [
":cronet_api",
@@ -409,6 +433,13 @@ android_library("cronet_test_apk_java") {
"//base:base_java",
"//net/android:net_java_test_support",
]
+
+ if (enable_bidirectional_stream) {
+ sources += [
kapishnikov 2016/01/27 21:50:29 Here should be 'java_files' instead of 'sources'.
mef 2016/01/29 00:15:29 Done.
+ "test/src/org/chromium/net/Http2TestHandler.java",
+ "test/src/org/chromium/net/Http2TestServer.java",
+ ]
+ }
}
android_assets("cronet_test_apk_assets") {
@@ -468,7 +499,38 @@ instrumentation_test_apk("cronet_test_instrumentation_apk") {
apk_name = "CronetTestInstrumentation"
apk_under_test = ":cronet_test_apk"
android_manifest = "test/javatests/AndroidManifest.xml"
- DEPRECATED_java_in_dir = "test/javatests/src"
+
+ java_files = [
+ "test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java",
+ "test/javatests/src/org/chromium/net/ChunkedWritableByteChannelTest.java",
+ "test/javatests/src/org/chromium/net/ContextInitTest.java",
+ "test/javatests/src/org/chromium/net/Criteria.java",
+ "test/javatests/src/org/chromium/net/CronetTestBase.java",
+ "test/javatests/src/org/chromium/net/CronetUploadTest.java",
+ "test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
+ "test/javatests/src/org/chromium/net/CronetUrlRequestTest.java",
+ "test/javatests/src/org/chromium/net/CronetUrlTest.java",
+ "test/javatests/src/org/chromium/net/GetStatusTest.java",
+ "test/javatests/src/org/chromium/net/HttpUrlRequestFactoryTest.java",
+ "test/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java",
+ "test/javatests/src/org/chromium/net/PkpTest.java",
+ "test/javatests/src/org/chromium/net/QuicTest.java",
+ "test/javatests/src/org/chromium/net/SdchTest.java",
+ "test/javatests/src/org/chromium/net/TestDrivenDataProvider.java",
+ "test/javatests/src/org/chromium/net/TestHttpUrlRequestListener.java",
+ "test/javatests/src/org/chromium/net/TestUploadDataProvider.java",
+ "test/javatests/src/org/chromium/net/TestUrlRequestCallback.java",
+ "test/javatests/src/org/chromium/net/UploadTest.java",
+ "test/javatests/src/org/chromium/net/UrlResponseInfoTest.java",
+ "test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java",
+ "test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java",
+ "test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java",
+ "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java",
+ "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java",
+ "test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java",
+ "test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java",
+ "test/javatests/src/org/chromium/net/urlconnection/TestUtil.java",
+ ]
deps = [
":cronet_api",
@@ -481,6 +543,13 @@ instrumentation_test_apk("cronet_test_instrumentation_apk") {
]
run_findbugs = true
+
+ if (enable_bidirectional_stream) {
+ sources += [
kapishnikov 2016/01/27 21:50:29 Same here: 'java_files' instead of 'sources'.
mef 2016/01/29 00:15:29 Done.
+ "test/javatests/src/org/chromium/net/BidirectionalStreamTest.java",
+ "test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java",
+ ]
+ }
}
test("cronet_unittests") {
@@ -683,3 +752,9 @@ group("cronet_package") {
":repackage_extracted_jars",
]
}
+
+buildflag_header("features") {
+ header = "../cronet_features.h"
+
+ flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$enable_bidirectional_stream" ]
+}
« no previous file with comments | « components/cronet.gypi ('k') | components/cronet/android/api/src/org/chromium/net/BidirectionalStream.java » ('j') | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698