Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/protoc-artifacts/build-protoc.sh

 #!/bin/bash
 
-# Builds protoc executable into target/protoc.exe; optionally build protoc
-# plugins into target/protoc-gen-*.exe
+# Builds protoc executable into target/protoc.exe
 # To be run from Maven.
-# Usage: build-protoc.sh <OS> <ARCH> <TARGET>
+# Usage: build-protoc.sh <OS> <ARCH>
 # <OS> and <ARCH> are ${os.detected.name} and ${os.detected.arch} from os-maven-plugin
-# <TARGET> can be "protoc" or "protoc-gen-javalite"
 OS=$1
 ARCH=$2
-MAKE_TARGET=$3
 
-if [[ $# < 3 ]]; then
+if [[ $# < 2 ]]; then
   echo "No arguments provided. This script is intended to be run from Maven."
   exit 1
 fi
 
-case $MAKE_TARGET in
-  protoc-gen-javalite)
-    ;;
-  protoc)
-    ;;
-  *)
-    echo "Target ""$TARGET"" invalid."
-    exit 1
-esac
-
 # Under Cygwin, bash doesn't have these in PATH when called from Maven which
 # runs in Windows version of Java.
 export PATH="/bin:/usr/bin:$PATH"
 
 ############################################################################
 # Helper functions
 ############################################################################
 E_PARAM_ERR=98
 E_ASSERT_FAILED=99
 
@@ skipping 94 matching lines @@
   if [[ $ret == 0 ]]; then
     fail "found unexpected dependencies (listed above)."
   elif [[ $ret != 1 ]]; then
     fail "Error when checking dependencies."
   fi  # grep returns 1 when "not found", which is what we expect
   echo "Dependencies look good."
   echo
 }
 ############################################################################
 
-echo "Building protoc, OS=$OS ARCH=$ARCH TARGET=$TARGET"
+echo "Building protoc, OS=$OS ARCH=$ARCH"
 
 # Nested double quotes are unintuitive, but it works.
 cd "$(dirname "$0")"
 
 WORKING_DIR=$(pwd)
 CONFIGURE_ARGS="--disable-shared"
 
-TARGET_FILE=target/$MAKE_TARGET.exe
+MAKE_TARGET="protoc"
 if [[ "$OS" == windows ]]; then
   MAKE_TARGET="${MAKE_TARGET}.exe"
 fi
 
 # Override the default value set in configure.ac that has '-g' which produces
 # huge binary.
 CXXFLAGS="-DNDEBUG"
 LDFLAGS=""
 
 if [[ "$(uname)" == CYGWIN* ]]; then
@@ skipping 54 matching lines @@
 
 # Statically link libgcc and libstdc++.
 # -s to produce stripped binary.
 # And they don't work under Mac.
 if [[ "$OS" != osx ]]; then
   LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++ -s"
 fi
 
 export CXXFLAGS LDFLAGS
 
+TARGET_FILE=target/protoc.exe
+
 cd "$WORKING_DIR"/.. && ./configure $CONFIGURE_ARGS &&
   cd src && make clean && make $MAKE_TARGET &&
   cd "$WORKING_DIR" && mkdir -p target &&
-  cp ../src/$MAKE_TARGET $TARGET_FILE ||
+  (cp ../src/protoc $TARGET_FILE || cp ../src/protoc.exe $TARGET_FILE) ||
   exit 1
 
 if [[ "$OS" == osx ]]; then
   # Since Mac linker doesn't accept "-s", we need to run strip
   strip $TARGET_FILE || exit 1
 fi
 
 checkArch $TARGET_FILE && checkDependencies $TARGET_FILE