Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated fix for refs/heads/remove-cronet #78

Open
wants to merge 3 commits into
base: remove-cronet
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -955,33 +955,6 @@ grpc_cc_library(
],
)

grpc_cc_library(
name = "grpc_cronet_hdrs",
hdrs = [
"include/grpc/grpc_cronet.h",
],
deps = [
"gpr_public_hdrs",
"grpc_base",
],
)

grpc_cc_library(
name = "grpc++_cronet_credentials",
srcs = [
"src/cpp/client/cronet_credentials.cc",
],
hdrs = [
"include/grpcpp/security/cronet_credentials.h",
],
language = "c++",
deps = [
"grpc++_base",
"grpc_cronet_hdrs",
"grpc_public_hdrs",
],
)

# This target pulls in a dependency on RE2 and should not be linked into grpc by default for binary-size reasons.
grpc_cc_library(
name = "grpc_authorization_provider",
Expand Down
1 change: 0 additions & 1 deletion Package.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -147,22 +147,3 @@ bind(
name = "madler_zlib",
actual = "@zlib//:zlib",
)

# TODO: Enable below once https://github.com/bazel-xcode/PodToBUILD/issues/232 is resolved
#
#http_archive(
# name = "rules_pods",
# urls = ["https://github.com/pinterest/PodToBUILD/releases/download/4.1.0-412495/PodToBUILD.zip"],
#)
#
#load(
# "@rules_pods//BazelExtensions:workspace.bzl",
# "new_pod_repository",
#)
#
#new_pod_repository(
# name = "CronetFramework",
# is_dynamic_framework = True,
# podspec_url = "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/2/e/1/CronetFramework/0.0.5/CronetFramework.podspec.json",
# url = "https://storage.googleapis.com/grpc-precompiled-binaries/cronet/Cronet.framework-v0.0.5.zip",
#)
2 changes: 0 additions & 2 deletions bazel/grpc_build_system.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ def _get_external_deps(external_deps):
"//:grpc_no_ares": [],
"//conditions:default": ["//third_party:cares"],
})
elif dep == "cronet_c_for_grpc":
ret.append("//third_party/objective_c/Cronet:cronet_c_for_grpc")
elif dep.startswith("absl/"):
ret.append("@com_google_absl//" + dep)
elif dep.startswith("google/"):
Expand Down
3 changes: 1 addition & 2 deletions doc/core/transport_explainer.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ the transports are nominally written in C++ though they are idiomatically C. The
existing transports are:

* [HTTP/2](https://github.com/grpc/grpc/tree/master/src/core/ext/transport/chttp2)
* [Cronet](https://github.com/grpc/grpc/tree/master/src/core/ext/transport/cronet)
* [In-process](https://github.com/grpc/grpc/tree/master/src/core/ext/transport/inproc)

Among these, the in-process is likely the easiest to understand, though arguably
Expand Down Expand Up @@ -138,7 +137,7 @@ in the HTTP/2 transport).
metadata (e.g., Method and Authority for initial metadata)
* [Specific transport
layer](https://github.com/grpc/grpc/tree/master/src/core/ext/transport):
- Either send it to the other side using transport-specific API (e.g., Cronet)
- Either send it to the other side using transport-specific API
- Or have it sent through the [iomgr/endpoint
layer](https://github.com/grpc/grpc/tree/master/src/core/lib/iomgr) (e.g.,
HTTP/2)
Expand Down
1 change: 0 additions & 1 deletion doc/trace_flags.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions doc/workarounds.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,3 @@
This document lists the workarounds implemented on gRPC servers for record and reference when users need to enable a certain workaround.

## Workaround List

### Cronet Compression

**Workaround ID:** WORKAROUND\_ID\_CRONET\_COMPRESSION

**Date added:** May 06, 2017

**Status:** Implemented in C core and C++

**Issue:** Before version v1.3.0-dev, gRPC iOS client's Cronet transport did not implement compression. However the clients still claim to support compression. As a result, a client fails to parse received message when the message is compressed.
The problem above was resolved in gRPC v1.3.0-dev. For backward compatibility, a server must forcingly disable compression for gRPC clients of version lower than or equal to v1.3.0-dev.

**Workaround Description:** Implemented as a server channel filter in C core. The filter identifies the version of peer client with incoming `user-agent` header of each call. If the client's gRPC version is lower that or equal to v1.3.x, a flag GRPC_WRITE_NO_COMPRESS is marked for all send_message ops which prevents compression of the messages to be sent out.
19 changes: 0 additions & 19 deletions gRPC-C++.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 0 additions & 22 deletions gRPC-Core.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions gRPC.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 0 additions & 37 deletions include/grpc/grpc_cronet.h

This file was deleted.

7 changes: 0 additions & 7 deletions include/grpc/impl/channel_arg_names.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,6 @@
* level. Disabling channelz naturally disables channel tracing. The default
* is for channelz to be enabled. */
#define GRPC_ARG_ENABLE_CHANNELZ "grpc.enable_channelz"
/** If non-zero, Cronet transport will coalesce packets to fewer frames
* when possible. */
#define GRPC_ARG_USE_CRONET_PACKET_COALESCING \
"grpc.use_cronet_packet_coalescing"
/** Channel arg (integer) setting how large a slice to try and read from the
wire each time recvmsg (or equivalent) is called **/
#define GRPC_ARG_TCP_READ_CHUNK_SIZE "grpc.experimental.tcp_read_chunk_size"
Expand Down Expand Up @@ -290,9 +286,6 @@
over to the next priority. Default value is 10 seconds. */
#define GRPC_ARG_PRIORITY_FAILOVER_TIMEOUT_MS \
"grpc.priority_failover_timeout_ms"
/** If non-zero, grpc server's cronet compression workaround will be enabled */
#define GRPC_ARG_WORKAROUND_CRONET_COMPRESSION \
"grpc.workaround.cronet_compression"
/** String defining the optimization target for a channel.
Can be: "latency" - attempt to minimize latency at the cost of throughput
"blend" - try to balance latency and throughput
Expand Down
5 changes: 1 addition & 4 deletions include/grpc/support/workaround_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
* explanation and detailed descriptions of workarounds, see
* /doc/workarounds.md
*/
typedef enum {
GRPC_WORKAROUND_ID_CRONET_COMPRESSION = 0,
GRPC_MAX_WORKAROUND_ID
} grpc_workaround_list;
typedef enum { GRPC_MAX_WORKAROUND_ID } grpc_workaround_list;

#endif /* GRPC_SUPPORT_WORKAROUND_LIST_H */
33 changes: 0 additions & 33 deletions include/grpcpp/security/cronet_credentials.h

This file was deleted.

59 changes: 0 additions & 59 deletions src/core/ext/transport/cronet/BUILD

This file was deleted.

Loading