Revert "Update protobuf to 3.6.0. Fixes bazelbuild#5439"

This reverts commit 6fd4e0e.

third_party/googleapis/BUILD

@@ -146,8 +146,8 @@ proto_library(
         ":google_api_annotations_proto",
         ":google_longrunning_operations_proto",
         ":google_rpc_status_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
+        "@com_google_protobuf//:well_known_types_any_proto",
+        "@com_google_protobuf//:well_known_types_duration_proto",
     ],
 )
 
@@ -160,8 +160,8 @@ proto_library(
     name = "google_rpc_error_details_proto",
     srcs = ["google/rpc/error_details.proto"],
     deps = [
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
+        "@com_google_protobuf//:well_known_types_any_proto",
+        "@com_google_protobuf//:well_known_types_duration_proto",
     ],
 )
 
@@ -170,8 +170,8 @@ proto_library(
     srcs = ["google/watcher/v1/watch.proto"],
     deps = [
         ":google_api_annotations_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:empty_proto",
+        "@com_google_protobuf//:well_known_types_any_proto",
+        "@com_google_protobuf//:well_known_types_empty_proto",
     ],
 )
 
@@ -180,7 +180,7 @@ proto_library(
     srcs = ["google/bytestream/bytestream.proto"],
     deps = [
         ":google_api_annotations_proto",
-        "@com_google_protobuf//:wrappers_proto",
+        "@com_google_protobuf//:well_known_types_wrappers_proto",
     ],
 )
 
@@ -191,8 +191,8 @@ proto_library(
         ":google_api_annotations_proto",
         ":google_api_http_proto",
         ":google_rpc_status_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:empty_proto",
+        "@com_google_protobuf//:well_known_types_any_proto",
+        "@com_google_protobuf//:well_known_types_empty_proto",
     ],
 )
 
@@ -201,7 +201,7 @@ proto_library(
     srcs = ["google/devtools/build/v1/build_status.proto"],
     deps = [
         ":google_api_annotations_proto",
-        "@com_google_protobuf//:any_proto",
+        "@com_google_protobuf//:well_known_types_any_proto",
     ],
 )
 
@@ -212,9 +212,9 @@ proto_library(
         ":google_api_annotations_proto",
         ":google_devtools_build_v1_build_status_proto",
         ":google_rpc_status_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:timestamp_proto",
-        "@com_google_protobuf//:wrappers_proto",
+        "@com_google_protobuf//:well_known_types_any_proto",
+        "@com_google_protobuf//:well_known_types_timestamp_proto",
+        "@com_google_protobuf//:well_known_types_wrappers_proto",
     ],
 )
 
@@ -225,9 +225,9 @@ proto_library(
         ":google_api_annotations_proto",
         ":google_api_auth_proto",
         ":google_devtools_build_v1_build_events_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:empty_proto",
+        "@com_google_protobuf//:well_known_types_any_proto",
+        "@com_google_protobuf//:well_known_types_duration_proto",
+        "@com_google_protobuf//:well_known_types_empty_proto",
     ],
 )
 
@@ -236,7 +236,7 @@ proto_library(
     srcs = ["google/api/annotations.proto"],
     deps = [
         ":google_api_http_proto",
-        "@com_google_protobuf//:descriptor_proto",
+        "@com_google_protobuf//:well_known_types_descriptor_proto",
     ],
 )
 
@@ -248,7 +248,7 @@ proto_library(
 proto_library(
     name = "google_rpc_status_proto",
     srcs = ["google/rpc/status.proto"],
-    deps = ["@com_google_protobuf//:any_proto"],
+    deps = ["@com_google_protobuf//:well_known_types_any_proto"],
 )
 
 proto_library(

third_party/grpc/build_defs.bzl

@@ -6,9 +6,7 @@ load("//third_party/grpc:build_defs.bzl", "java_grpc_library")
 def _path_ignoring_repository(f):
   if (len(f.owner.workspace_root) == 0):
     return f.short_path
-  # If |f| is a generated file, it will have "bazel-out/*/genfiles" prefix
-  # before "external/workspace", so we need to add the starting index of "external/workspace"
-  return f.path[f.path.find(f.owner.workspace_root)+len(f.owner.workspace_root)+1:]
+  return f.path[len(f.owner.workspace_root)+1:]
 
 def _gensource_impl(ctx):
   if len(ctx.attr.srcs) > 1:

third_party/protobuf/3.4.0/.travis.yml

@@ -0,0 +1,91 @@
+sudo: required
+dist: trusty
+# Note: travis currently does not support listing more than one language so
+# this cheats and claims to only be cpp.  If they add multiple language
+# support, this should probably get updated to install steps and/or
+# rvm/gemfile/jdk/etc. entries rather than manually doing the work.
+language: cpp
+os:
+  - osx
+# The Objective C build needs Xcode 7.0 or later.
+osx_image: xcode8.1
+script:
+  - ./tests.sh $CONFIG
+env:
+  - CONFIG=cpp
+  - CONFIG=cpp_distcheck
+  - CONFIG=golang
+  - CONFIG=java_jdk7
+  - CONFIG=java_oracle7
+  - CONFIG=javanano_jdk7
+  - CONFIG=javanano_oracle7
+  - CONFIG=javascript
+  # iOS build log was starting to choke travis UI, so split to cover the
+  # Xcode Debug and Release Configurations independently.
+  - CONFIG=objectivec_ios_debug
+  - CONFIG=objectivec_ios_release
+  - CONFIG=objectivec_osx
+  - CONFIG=objectivec_cocoapods_integration
+  - CONFIG=python
+  - CONFIG=python_cpp
+  - CONFIG=ruby21
+  - CONFIG=ruby22
+  - CONFIG=jruby
+  - CONFIG=php5.6_mac
+  - CONFIG=php7.0_mac
+matrix:
+  exclude:
+    # It's nontrivial to programmatically install a new JDK from the command
+    # line on OS X, so we rely on testing on Linux for Java code.
+    - os: osx
+      env: CONFIG=java_jdk7
+    - os: osx
+      env: CONFIG=java_oracle7
+    - os: osx
+      env: CONFIG=javanano_jdk7
+    - os: osx
+      env: CONFIG=javanano_oracle7
+    # Requires installing golang, currently travis.sh is doing that with apt-get
+    # which doesn't work on OS X.
+    - os: osx
+      env: CONFIG=golang
+  include:
+    # The dotnet environment requires Ubuntu 14.04 or 16.04. This
+    # configuration is effectively an "extra" one, outside the
+    # autogenerated matrix.
+    - os: linux
+      env: CONFIG=csharp
+      language: csharp
+      dist: trusty
+      dotnet: 1.0.1
+      mono: none
+    # This test is kept on travis because it doesn't play nicely with other
+    # tests on jenkins running in parallel.
+    - os: linux
+      env: CONFIG=cpp_distcheck
+    # The Java compatibility test currently only runs on Linux because it will
+    # fetch pre-built Linux protoc binaries in the test.
+    - os: linux
+      env: CONFIG=java_compatibility
+    # The Python compatibility test currently only runs on Linux because it will
+    # fetch pre-built Linux protoc binaries in the test.
+    - os: linux
+      env: CONFIG=python_compatibility
+  allow_failures:
+    # These currently do not work on OS X but are being worked on by @haberman.
+    - os: osx
+      env: CONFIG=ruby22
+    - os: osx
+      env: CONFIG=jruby
+    # https://github.com/google/protobuf/issues/1253 - Started failing when
+    # we moved to an OS X image that is 10.11.
+    - os: osx
+      env: CONFIG=python_cpp
+    # Mark the iOS test as flakey as xcodebuild some times fails to start the
+    # iOS Simulator.
+    - os: osx
+      env: CONFIG=objectivec_ios_debug
+    - os: osx
+      env: CONFIG=objectivec_ios_release
+notifications:
+  email: false