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

Unified Diff: components/cronet.gypi

Issue 1412243012: Initial implementation of CronetBidirectionalStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Paul'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
Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index b45aeda7c4de0b1afe2c2ae49d3532cdd4435215..3815932562fa371d9ad2461b83be8f3140c75d79 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -3,6 +3,9 @@
# found in the LICENSE file.
{
+ 'variables': {
+ 'enable_bidirectional_stream%': 0,
+ },
'conditions': [
['OS=="android"', {
'targets': [
@@ -10,6 +13,7 @@
'target_name': 'cronet_jni_headers',
'type': 'none',
'sources': [
+ 'cronet/android/java/src/org/chromium/net/CronetBidirectionalStream.java',
'cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java',
'cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java',
'cronet/android/java/src/org/chromium/net/CronetUrlRequest.java',
@@ -193,6 +197,17 @@
'includes': [ 'cronet/cronet_static.gypi' ],
},
{
+ # GN version: //cronet:features
+ 'target_name': 'cronet_features',
+ 'includes': [ '../build/buildflag_header.gypi' ],
+ 'variables': {
+ 'buildflag_header_path': 'components/cronet/cronet_features.h',
+ 'buildflag_flags': [
+ 'ENABLE_BIDIRECTIONAL_STREAM=<(enable_bidirectional_stream)',
+ ],
+ },
+ },
+ {
'target_name': 'libcronet',
'type': 'shared_library',
'sources': [
@@ -242,6 +257,7 @@
'**/ChromiumUrlRequestError.java',
'**/ChromiumUrlRequestFactory.java',
'**/ChromiumUrlRequestPriority.java',
+ '**/CronetBidirectionalStream.java',
'**/CronetLibraryLoader.java',
'**/CronetUploadDataStream.java',
'**/CronetUrlRequest.java',
@@ -419,6 +435,16 @@
'is_test_apk': 1,
'run_findbugs': 1,
},
+ 'conditions': [
+ ['enable_bidirectional_stream==0', {
+ 'variables' : {
+ 'jar_excluded_classes': [
+ '**/BidirectionalStreamTest*',
+ '**/TestBidirectionalStreamCallback*',
+ ],
+ },
+ },],
+ ],
'includes': [ '../build/java_apk.gypi' ],
},
{

Powered by Google App Engine
This is Rietveld 408576698