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

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: Destroy the native adapter instead of cancel if can't post task to executor. 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
Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index dab63ff1b6703ab8bbca5a4e46f34d437912ed69..dbd013a4da62021e7d7e2d450a165d201736772a 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) {
+ 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",
@@ -683,3 +694,9 @@ group("cronet_package") {
":repackage_extracted_jars",
]
}
+
+buildflag_header("features") {
+ header = "../cronet_features.h"
+
+ flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$enable_bidirectional_stream" ]
pauljensen 2016/01/19 16:03:39 Could we instead do this like we do DATA_REDUCTION
mef 2016/01/20 15:37:39 Build flags are the new hotness": https://groups.g
+}

Powered by Google App Engine
This is Rietveld 408576698