Skip to content

Commit 277002c

Browse files
committed
Merge branch 'master' of github.com:grpc/grpc into hpack-buffering
2 parents 03854f0 + 93d95de commit 277002c

File tree

8 files changed

+150
-1
lines changed

8 files changed

+150
-1
lines changed

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you plan to build using CMake
2020
If you are a contributor and plan to build and run tests, install the following as well:
2121
```sh
2222
$ # clang and LLVM C++ lib is only required for sanitizer builds
23-
$ [sudo] apt-get install clang-5.0 libc++-dev
23+
$ [sudo] apt-get install clang libc++-dev
2424
```
2525

2626
## MacOS

CMakeLists.txt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@ if(gRPC_BUILD_TESTS)
749749
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
750750
add_dependencies(buildtests_cxx bdp_estimator_test)
751751
endif()
752+
add_dependencies(buildtests_cxx binder_smoke_test)
752753
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
753754
add_dependencies(buildtests_cxx bm_alarm)
754755
endif()
@@ -8300,6 +8301,41 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
83008301

83018302

83028303
endif()
8304+
endif()
8305+
if(gRPC_BUILD_TESTS)
8306+
8307+
add_executable(binder_smoke_test
8308+
test/core/transport/binder/binder_smoke_test.cc
8309+
third_party/googletest/googletest/src/gtest-all.cc
8310+
third_party/googletest/googlemock/src/gmock-all.cc
8311+
)
8312+
8313+
target_include_directories(binder_smoke_test
8314+
PRIVATE
8315+
${CMAKE_CURRENT_SOURCE_DIR}
8316+
${CMAKE_CURRENT_SOURCE_DIR}/include
8317+
${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
8318+
${_gRPC_RE2_INCLUDE_DIR}
8319+
${_gRPC_SSL_INCLUDE_DIR}
8320+
${_gRPC_UPB_GENERATED_DIR}
8321+
${_gRPC_UPB_GRPC_GENERATED_DIR}
8322+
${_gRPC_UPB_INCLUDE_DIR}
8323+
${_gRPC_XXHASH_INCLUDE_DIR}
8324+
${_gRPC_ZLIB_INCLUDE_DIR}
8325+
third_party/googletest/googletest/include
8326+
third_party/googletest/googletest
8327+
third_party/googletest/googlemock/include
8328+
third_party/googletest/googlemock
8329+
${_gRPC_PROTO_GENS_DIR}
8330+
)
8331+
8332+
target_link_libraries(binder_smoke_test
8333+
${_gRPC_PROTOBUF_LIBRARIES}
8334+
${_gRPC_ALLTARGETS_LIBRARIES}
8335+
grpc_test_util
8336+
)
8337+
8338+
83038339
endif()
83048340
if(gRPC_BUILD_TESTS)
83058341
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)

build_autogenerated.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4381,6 +4381,16 @@ targets:
43814381
- posix
43824382
- mac
43834383
uses_polling: false
4384+
- name: binder_smoke_test
4385+
gtest: true
4386+
build: test
4387+
language: c++
4388+
headers: []
4389+
src:
4390+
- test/core/transport/binder/binder_smoke_test.cc
4391+
deps:
4392+
- grpc_test_util
4393+
uses_polling: false
43844394
- name: bm_alarm
43854395
build: test
43864396
language: c++
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Binder transport for cross process IPC on Android
2+
3+
Under construction.
4+
5+
This transport implements
6+
[BinderChannel for native cross-process communication on Android](https://github.com/grpc/proposal/blob/master/L73-java-binderchannel.md)

test/core/transport/binder/BUILD

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Copyright 2021 gRPC authors.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package")
16+
17+
licenses(["notice"])
18+
19+
grpc_package(name = "test/core/transport/binder")
20+
21+
grpc_cc_test(
22+
name = "binder_smoke_test",
23+
srcs = ["binder_smoke_test.cc"],
24+
external_deps = [
25+
"gtest",
26+
],
27+
language = "C++",
28+
uses_polling = False,
29+
deps = [
30+
"//:gpr",
31+
"//:grpc",
32+
"//test/core/util:grpc_test_util",
33+
],
34+
)
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
//
2+
// Copyright 2021 gRPC authors.
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
//
16+
17+
#include <grpc/grpc.h>
18+
#include <grpc/support/log.h>
19+
#include <gtest/gtest.h>
20+
21+
#include "test/core/util/test_config.h"
22+
23+
namespace grpc_core {
24+
namespace testing {
25+
namespace {
26+
TEST(SmokeTest, Empty) { gpr_log(GPR_INFO, __func__); }
27+
} // namespace
28+
} // namespace testing
29+
} // namespace grpc_core
30+
31+
int main(int argc, char** argv) {
32+
::testing::InitGoogleTest(&argc, argv);
33+
grpc::testing::TestEnvironment env(argc, argv);
34+
grpc_init();
35+
int ret = RUN_ALL_TESTS();
36+
grpc_shutdown();
37+
return ret;
38+
}

tools/doxygen/Doxyfile.core.internal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,7 @@ src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h \
10111011
src/core/ext/filters/workarounds/workaround_utils.cc \
10121012
src/core/ext/filters/workarounds/workaround_utils.h \
10131013
src/core/ext/transport/README.md \
1014+
src/core/ext/transport/binder/README.md \
10141015
src/core/ext/transport/chttp2/README.md \
10151016
src/core/ext/transport/chttp2/alpn/alpn.cc \
10161017
src/core/ext/transport/chttp2/alpn/alpn.h \

tools/run_tests/generated/tests.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3429,6 +3429,30 @@
34293429
],
34303430
"uses_polling": false
34313431
},
3432+
{
3433+
"args": [],
3434+
"benchmark": false,
3435+
"ci_platforms": [
3436+
"linux",
3437+
"mac",
3438+
"posix",
3439+
"windows"
3440+
],
3441+
"cpu_cost": 1.0,
3442+
"exclude_configs": [],
3443+
"exclude_iomgrs": [],
3444+
"flaky": false,
3445+
"gtest": true,
3446+
"language": "c++",
3447+
"name": "binder_smoke_test",
3448+
"platforms": [
3449+
"linux",
3450+
"mac",
3451+
"posix",
3452+
"windows"
3453+
],
3454+
"uses_polling": false
3455+
},
34323456
{
34333457
"args": [],
34343458
"benchmark": true,

0 commit comments

Comments
 (0)