diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2018-07-03 09:33:52 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2018-08-07 14:28:41 +0200 |
| commit | 6ed3c45cbd7e7a27bbe2d4071e711b80366f2f9f (patch) | |
| tree | 5bc27e9e5c3da45181963e714a4a6329a5782805 | |
| parent | 02d4afb94c8f06c7184691f27ed0518f9c359ea9 (diff) | |
android patch no longer needer
| -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/" |