diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-08-11 21:19:14 -0400 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-08-11 21:19:14 -0400 |
| commit | c8503544233421764c0cd04870db3d03a95bd47b (patch) | |
| tree | 15c4ff633797d310b59a16905c51b216f6fa37a7 /tools/internal_ci/linux/grpc_android.sh | |
| parent | e2a87dac6975b3cbf6e434e1bb5112269043653e (diff) | |
| parent | e495476b1e31023637259883aa735fcc716c6adc (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-subchannels
Diffstat (limited to 'tools/internal_ci/linux/grpc_android.sh')
| -rwxr-xr-x | tools/internal_ci/linux/grpc_android.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/internal_ci/linux/grpc_android.sh b/tools/internal_ci/linux/grpc_android.sh index 2220145dac..42c7f5fb04 100755 --- a/tools/internal_ci/linux/grpc_android.sh +++ b/tools/internal_ci/linux/grpc_android.sh @@ -25,13 +25,6 @@ git submodule update --init # Build protoc and grpc_cpp_plugin. Codegen is not cross-compiled to Android make HAS_SYSTEM_PROTOBUF=false -# TODO(ericgribkoff) Remove when this commit (already in master) is included in -# next protobuf release -cd third_party/protobuf -git fetch -git cherry-pick 7daa320065f3bea2b54bf983337d1724f153422d -m 1 - - # Build and run interop instrumentation tests on Firebase Test Lab cd "${REPO_ROOT}/src/android/test/interop/" |