Add cronet and zlip files

Package.swift

@@ -44,7 +44,11 @@ let package = Package(
         "third_party/re2/LICENSE",
         "third_party/utf8_range/LICENSE",
         "third_party/xxhash/LICENSE",
+        "third_party/zlib/LICENSE",
         "tests",
+        "include/grpc/grpc_cronet.h",
+        "src/core/ext/transport/cronet/",
+        "third_party/objective_c/Cronet/bidirectional_stream_c.h",
       ],
 
       sources: [
@@ -80,6 +84,8 @@ let package = Package(
       path: basePath,
       exclude: [
         "tests",
+        "include/grpcpp/security/cronet_credentials.h",
+        "src/cpp/client/cronet_credentials.cc",
       ],
       sources: [
         "src/cpp/",

gRPC-C++.podspec

@@ -2786,10 +2786,8 @@ Pod::Spec.new do |s|
 
   s.subspec 'Cronet-Interface' do |ss|
     ss.header_mappings_dir = 'include/grpcpp'
-    ss.public_header_files = "include/grpcpp/security/cronet_credentials.h",
-                             "include/grpcpp/security/cronet_credentials_impl.h"
-    ss.source_files = "include/grpcpp/security/cronet_credentials.h",
-                      "include/grpcpp/security/cronet_credentials_impl.h"
+    ss.public_header_files = "include/grpcpp/security/cronet_credentials.h"
+    ss.source_files = "include/grpcpp/security/cronet_credentials.h"
   end
 
   s.subspec 'Cronet-Implementation' do |ss|

include/grpc/grpc_cronet.h

@@ -0,0 +1,37 @@
+/*
+ *
+ * Copyright 2016 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GRPC_GRPC_CRONET_H
+#define GRPC_GRPC_CRONET_H
+
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+GRPCAPI grpc_channel* grpc_cronet_secure_channel_create(
+    void* engine, const char* target, const grpc_channel_args* args,
+    void* reserved);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GRPC_GRPC_CRONET_H */

include/grpcpp/security/cronet_credentials.h

@@ -0,0 +1,33 @@
+//
+//
+// Copyright 2019 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#ifndef GRPCPP_SECURITY_CRONET_CREDENTIALS_H
+#define GRPCPP_SECURITY_CRONET_CREDENTIALS_H
+
+#include <memory>
+
+namespace grpc {
+
+class ChannelCredentials;
+
+/// Credentials for a channel using Cronet.
+std::shared_ptr<ChannelCredentials> CronetChannelCredentials(void* engine);
+
+}  // namespace grpc
+
+#endif  // GRPCPP_SECURITY_CRONET_CREDENTIALS_H

scripts/extract-grpc-ios-files.py

@@ -33,6 +33,7 @@
     'upb_textformat_lib',
     'utf8_range_lib',
     're2',
+    'z',
 )
 
 exclude_files = (
@@ -49,6 +50,17 @@
     'src/objective-c/!ProtoCompiler-gRPCPlugin.podspec',
     'src/objective-c/!ProtoCompiler.podspec',
     'src/objective-c/BoringSSL-GRPC.podspec',
+    # cronet files
+    'include/grpc/grpc_cronet.h',
+    'src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc',
+    'src/core/ext/transport/cronet/client/secure/cronet_channel_create.h',
+    'src/core/ext/transport/cronet/transport/cronet_status.cc',
+    'src/core/ext/transport/cronet/transport/cronet_status.h',
+    'src/core/ext/transport/cronet/transport/cronet_transport.cc',
+    'src/core/ext/transport/cronet/transport/cronet_transport.h',
+    'third_party/objective_c/Cronet/bidirectional_stream_c.h',
+    'include/grpcpp/security/cronet_credentials.h',
+    'src/cpp/client/cronet_credentials.cc',
     # podspec files
     'gRPC-C++.podspec',
     'gRPC-Core.podspec',
@@ -65,6 +77,7 @@
     'third_party/re2/LICENSE',
     'third_party/utf8_range/LICENSE',
     'third_party/xxhash/LICENSE',
+    'third_party/zlib/LICENSE',
     # docs
     'README.md',
 )

src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc

@@ -0,0 +1,59 @@
+//
+//
+// Copyright 2016 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/transport/cronet/client/secure/cronet_channel_create.h"
+
+#include "absl/status/statusor.h"
+
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/log.h>
+
+#include "src/core/ext/transport/cronet/transport/cronet_transport.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/channel/channel_args_preconditioning.h"
+#include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/surface/channel.h"
+#include "src/core/lib/surface/channel_create.h"
+#include "src/core/lib/surface/channel_stack_type.h"
+#include "src/core/lib/transport/transport.h"
+
+GRPCAPI grpc_channel* grpc_cronet_secure_channel_create(
+    void* engine, const char* target, const grpc_channel_args* args,
+    void* reserved) {
+  gpr_log(GPR_DEBUG,
+          "grpc_create_cronet_transport: stream_engine = %p, target=%s", engine,
+          target);
+
+  // Disable client authority filter when using Cronet
+  auto channel_args = grpc_core::CoreConfiguration::Get()
+                          .channel_args_preconditioning()
+                          .PreconditionChannelArgs(args)
+                          .Set(GRPC_ARG_DISABLE_CLIENT_AUTHORITY_FILTER, 1);
+
+  grpc_core::Transport* ct = grpc_create_cronet_transport(
+      engine, target, channel_args.ToC().get(), reserved);
+
+  grpc_core::ExecCtx exec_ctx;
+  auto channel = grpc_core::ChannelCreate(target, channel_args,
+                                          GRPC_CLIENT_DIRECT_CHANNEL, ct);
+  return channel.ok() ? channel->release()->c_ptr() : nullptr;
+}

src/core/ext/transport/cronet/client/secure/cronet_channel_create.h

@@ -0,0 +1,37 @@
+//
+//
+// Copyright 2016 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CRONET_CLIENT_SECURE_CRONET_CHANNEL_CREATE_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CRONET_CLIENT_SECURE_CRONET_CHANNEL_CREATE_H
+#include <grpc/support/port_platform.h>
+
+#include <grpc/grpc.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+GRPCAPI grpc_channel* grpc_cronet_secure_channel_create(
+    void* engine, const char* target, const grpc_channel_args* args,
+    void* reserved);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CRONET_CLIENT_SECURE_CRONET_CHANNEL_CREATE_H