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

third_party/protobuf/BUILD

 # Bazel (http://bazel.io/) BUILD file for Protobuf.
 
 licenses(["notice"])
 
-exports_files(["LICENSE"])
-
 ################################################################################
 # Protobuf Runtime Library
 ################################################################################
 
 COPTS = [
     "-DHAVE_PTHREAD",
     "-Wall",
     "-Wwrite-strings",
     "-Woverloaded-virtual",
     "-Wno-sign-compare",
-    "-Wno-unused-function",
+    "-Wno-error=unused-function",
 ]
 
 config_setting(
     name = "android",
     values = {
         "crosstool_top": "//external:android/crosstool",
     },
 )
 
 # Android builds do not need to link in a separate pthread library.
 LINK_OPTS = select({
     ":android": [],
     "//conditions:default": ["-lpthread"],
 })
 
 load(
     "protobuf",
     "cc_proto_library",
     "py_proto_library",
-    "internal_copied_filegroup",
     "internal_gen_well_known_protos_java",
     "internal_protobuf_py_tests",
 )
 
 config_setting(
     name = "ios_armv7",
     values = {
         "ios_cpu": "armv7",
     },
 )
@@ skipping 249 matching lines @@
         "src/google/protobuf/compiler/javanano/javanano_extension.cc",
         "src/google/protobuf/compiler/javanano/javanano_field.cc",
         "src/google/protobuf/compiler/javanano/javanano_file.cc",
         "src/google/protobuf/compiler/javanano/javanano_generator.cc",
         "src/google/protobuf/compiler/javanano/javanano_helpers.cc",
         "src/google/protobuf/compiler/javanano/javanano_map_field.cc",
         "src/google/protobuf/compiler/javanano/javanano_message.cc",
         "src/google/protobuf/compiler/javanano/javanano_message_field.cc",
         "src/google/protobuf/compiler/javanano/javanano_primitive_field.cc",
         "src/google/protobuf/compiler/js/js_generator.cc",
-        "src/google/protobuf/compiler/js/well_known_types_embed.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_enum.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_extension.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_field.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_file.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_generator.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_helpers.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_map_field.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_message.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_message_field.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_oneof.cc",
         "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc",
-        "src/google/protobuf/compiler/php/php_generator.cc",
         "src/google/protobuf/compiler/plugin.cc",
         "src/google/protobuf/compiler/plugin.pb.cc",
         "src/google/protobuf/compiler/python/python_generator.cc",
         "src/google/protobuf/compiler/ruby/ruby_generator.cc",
         "src/google/protobuf/compiler/subprocess.cc",
         "src/google/protobuf/compiler/zip_writer.cc",
     ],
     copts = COPTS,
     includes = ["src/"],
     linkopts = LINK_OPTS,
@@ skipping 54 matching lines @@
     "google/protobuf/unittest_proto3_arena_lite.proto",
     "google/protobuf/unittest_proto3_lite.proto",
     "google/protobuf/unittest_well_known_types.proto",
     "google/protobuf/util/internal/testdata/anys.proto",
     "google/protobuf/util/internal/testdata/books.proto",
     "google/protobuf/util/internal/testdata/default_value.proto",
     "google/protobuf/util/internal/testdata/default_value_test.proto",
     "google/protobuf/util/internal/testdata/field_mask.proto",
     "google/protobuf/util/internal/testdata/maps.proto",
     "google/protobuf/util/internal/testdata/oneofs.proto",
-    "google/protobuf/util/internal/testdata/proto3.proto",
     "google/protobuf/util/internal/testdata/struct.proto",
     "google/protobuf/util/internal/testdata/timestamp_duration.proto",
-    "google/protobuf/util/internal/testdata/wrappers.proto",
     "google/protobuf/util/json_format_proto3.proto",
     "google/protobuf/util/message_differencer_unittest.proto",
 ]
 
 TEST_PROTOS = ["src/" + s for s in RELATIVE_TEST_PROTOS]
 
 cc_proto_library(
     name = "cc_test_protos",
     srcs = LITE_TEST_PROTOS + TEST_PROTOS,
     include = "src",
@@ skipping 151 matching lines @@
 ################################################################################
 
 py_library(
     name = "python_srcs",
     srcs = glob(
         [
             "python/google/protobuf/*.py",
             "python/google/protobuf/**/*.py",
         ],
         exclude = [
-            "python/google/protobuf/__init__.py",
-            "python/google/protobuf/**/__init__.py",
             "python/google/protobuf/internal/*_test.py",
             "python/google/protobuf/internal/test_util.py",
         ],
     ),
     srcs_version = "PY2AND3",
     imports = ["python"],
 )
 
 cc_binary(
-    name = "python/google/protobuf/internal/_api_implementation.so",
+    name = "internal/_api_implementation.so",
     srcs = ["python/google/protobuf/internal/api_implementation.cc"],
     copts = COPTS + [
         "-DPYTHON_PROTO2_CPP_IMPL_V2",
     ],
     linkshared = 1,
     linkstatic = 1,
     deps = select({
         "//conditions:default": [],
         ":use_fast_cpp_protos": ["//external:python_headers"],
     }),
 )
 
 cc_binary(
-    name = "python/google/protobuf/pyext/_message.so",
+    name = "pyext/_message.so",
     srcs = glob([
         "python/google/protobuf/pyext/*.cc",
         "python/google/protobuf/pyext/*.h",
     ]),
     copts = COPTS + [
         "-DGOOGLE_PROTOBUF_HAS_ONEOF=1",
     ] + select({
         "//conditions:default": [],
         ":allow_oversize_protos": ["-DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS=1"],
     }),
@@ skipping 18 matching lines @@
     },
 )
 
 config_setting(
     name = "allow_oversize_protos",
     values = {
         "define": "allow_oversize_protos=true",
     },
 )
 
-# Copy the builtin proto files from src/google/protobuf to
-# python/google/protobuf. This way, the generated Python sources will be in the
-# same directory as the Python runtime sources. This is necessary for the
-# modules to be imported correctly since they are all part of the same Python
-# package.
-internal_copied_filegroup(
-    name = "protos_python",
-    srcs = WELL_KNOWN_PROTOS,
-    strip_prefix = "src",
-    dest = "python",
-)
-
-# TODO(dzc): Remove this once py_proto_library can have labels in srcs, in
-# which case we can simply add :protos_python in srcs.
-COPIED_WELL_KNOWN_PROTOS = ["python/" + s for s in RELATIVE_WELL_KNOWN_PROTOS]
-
 py_proto_library(
     name = "protobuf_python",
-    srcs = COPIED_WELL_KNOWN_PROTOS,
-    include = "python",
+    srcs = WELL_KNOWN_PROTOS,
+    include = "src",
     data = select({
         "//conditions:default": [],
         ":use_fast_cpp_protos": [
-            ":python/google/protobuf/internal/_api_implementation.so",
-            ":python/google/protobuf/pyext/_message.so",
+            ":internal/_api_implementation.so",
+            ":pyext/_message.so",
         ],
     }),
     default_runtime = "",
     protoc = ":protoc",
     py_libs = [
         ":python_srcs",
         "//external:six"
     ],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
 )
 
-# Copy the test proto files from src/google/protobuf to
-# python/google/protobuf. This way, the generated Python sources will be in the
-# same directory as the Python runtime sources. This is necessary for the
-# modules to be imported correctly by the tests since they are all part of the
-# same Python package.
-internal_copied_filegroup(
-    name = "protos_python_test",
-    srcs = LITE_TEST_PROTOS + TEST_PROTOS,
-    strip_prefix = "src",
-    dest = "python",
-)
-
-# TODO(dzc): Remove this once py_proto_library can have labels in srcs, in
-# which case we can simply add :protos_python_test in srcs.
-COPIED_LITE_TEST_PROTOS = ["python/" + s for s in RELATIVE_LITE_TEST_PROTOS]
-COPIED_TEST_PROTOS = ["python/" + s for s in RELATIVE_TEST_PROTOS]
-
 py_proto_library(
     name = "python_common_test_protos",
-    srcs = COPIED_LITE_TEST_PROTOS + COPIED_TEST_PROTOS,
-    include = "python",
+    srcs = LITE_TEST_PROTOS + TEST_PROTOS,
+    include = "src",
     default_runtime = "",
     protoc = ":protoc",
     srcs_version = "PY2AND3",
     deps = [":protobuf_python"],
 )
 
 py_proto_library(
     name = "python_specific_test_protos",
     srcs = glob([
         "python/google/protobuf/internal/*.proto",
         "python/google/protobuf/internal/import_test_package/*.proto",
     ]),
     include = "python",
     default_runtime = ":protobuf_python",
     protoc = ":protoc",
     srcs_version = "PY2AND3",
     deps = [":python_common_test_protos"],
 )
 
 py_library(
     name = "python_tests",
     srcs = glob(
         [
             "python/google/protobuf/internal/*_test.py",
             "python/google/protobuf/internal/test_util.py",
-            "python/google/protobuf/internal/import_test_package/__init__.py",
         ],
     ),
     imports = ["python"],
     srcs_version = "PY2AND3",
     deps = [
         ":protobuf_python",
         ":python_common_test_protos",
         ":python_specific_test_protos",
     ],
 )
@@ skipping 15 matching lines @@
         "reflection_test",
         "service_reflection_test",
         "symbol_database_test",
         "text_encoding_test",
         "text_format_test",
         "unknown_fields_test",
         "wire_format_test",
     ],
     deps = [":python_tests"],
 )
-
-proto_lang_toolchain(
-  name = "cc_toolchain",
-  runtime = ":protobuf",
-  command_line = "--cpp_out=$(OUT)",
-  visibility = ["//visibility:public"],
-)