From 6ed3c45cbd7e7a27bbe2d4071e711b80366f2f9f Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 3 Jul 2018 09:33:52 +0200 Subject: [PATCH] android patch no longer needer --- tools/internal_ci/linux/grpc_android.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/internal_ci/linux/grpc_android.sh b/tools/internal_ci/linux/grpc_android.sh index 2220145dacc..42c7f5fb042 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/"