Merge branch 'master' into minor-timer-fix

6 files changed, 97 insertions, 352 deletions

diff --git a/tools/distrib/check_nanopb_output.sh b/tools/distrib/check_nanopb_output.sh
index 6b98619c32..1c2ef9b768 100755
--- a/tools/distrib/check_nanopb_output.sh
+++ b/tools/distrib/check_nanopb_output.sh
@@ -16,6 +16,7 @@
 set -ex
 
 readonly NANOPB_ALTS_TMP_OUTPUT="$(mktemp -d)"
+readonly NANOPB_HEALTH_TMP_OUTPUT="$(mktemp -d)"
 readonly NANOPB_TMP_OUTPUT="$(mktemp -d)"
 readonly PROTOBUF_INSTALL_PREFIX="$(mktemp -d)"
 
@@ -68,6 +69,23 @@ if ! diff -r "$NANOPB_TMP_OUTPUT" src/core/ext/filters/client_channel/lb_policy/
 fi
 
 #
+# checks for health.proto
+#
+readonly HEALTH_GRPC_OUTPUT_PATH='src/cpp/server/health'
+# nanopb-compile the proto to a temp location
+./tools/codegen/core/gen_nano_proto.sh \
+  src/proto/grpc/health/v1/health.proto \
+  "$NANOPB_HEALTH_TMP_OUTPUT" \
+  "$HEALTH_GRPC_OUTPUT_PATH"
+# compare outputs to checked compiled code
+for NANOPB_OUTPUT_FILE in $NANOPB_HEALTH_TMP_OUTPUT/*.pb.*; do
+  if ! diff "$NANOPB_OUTPUT_FILE" "src/cpp/server/health/$(basename $NANOPB_OUTPUT_FILE)"; then
+    echo "Outputs differ: $NANOPB_HEALTH_TMP_OUTPUT vs $HEALTH_GRPC_OUTPUT_PATH"
+    exit 2
+  fi
+done
+
+#
 # Checks for handshaker.proto and transport_security_common.proto
 #
 readonly HANDSHAKER_GRPC_OUTPUT_PATH='src/core/tsi/alts/handshaker'
diff --git a/tools/distrib/check_shadow_boringssl_symbol_list.sh b/tools/distrib/check_shadow_boringssl_symbol_list.sh
new file mode 100755
index 0000000000..34ba09e07d
--- /dev/null
+++ b/tools/distrib/check_shadow_boringssl_symbol_list.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Copyright 2018 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# Check if the commit version of BoringSSL podspec, BoringSSL submodule, and
+# the shadowed symbol list are all based on the same BoringSSL commit.
+set -e
+
+cd $(dirname $0)
+
+boringssl_podspec_original="../../src/objective-c/BoringSSL-GRPC.podspec"
+symbol_list="../../src/objective-c/grpc_shadow_boringssl_symbol_list"
+
+# Check BoringSSL version matches
+ver1=$(git submodule |grep "boringssl " | awk '{print $1}' | head -n 1)
+ver2=$(cat $boringssl_podspec_original | grep ':commit =>' | sed -E 's/.*"(.*)".*/\1/g')
+ver3=$(cat $symbol_list | sed -n '2 p')
+[ $ver1 == $ver2 ] && [ $ver1 == $ver3 ] || { echo "BoringSSL podspec (src/objective-c/BoringSSL.podspec), BoringSSL submodule (third_party/boringssl), and BoringSSL symbol list (src/objective-c/grpc_shadow_boringssl_symbol_list) commit do not match." ; echo "BoringSSL podspec: $ver1" ; echo "BoringSSL submodule: $ver2" ; echo "BoringSSL symbol list: $ver3" ; exit 1 ; }
+
+exit 0
diff --git a/tools/distrib/generate_grpc_shadow_boringssl_symbol_list.sh b/tools/distrib/generate_grpc_shadow_boringssl_symbol_list.sh
new file mode 100755
index 0000000000..2e5bb44548
--- /dev/null
+++ b/tools/distrib/generate_grpc_shadow_boringssl_symbol_list.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# Copyright 2018 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generate the list of boringssl symbols that need to be shadowed based on the
+# current boringssl submodule. Requires local toolchain to build boringssl.
+set -e
+
+cd $(dirname $0)
+
+symbol_list="../../src/objective-c/grpc_shadow_boringssl_symbol_list"
+
+ssl_lib='../../third_party/boringssl/build/ssl/libssl.a'
+crypto_lib='../../third_party/boringssl/build/crypto/libcrypto.a'
+
+# Generate boringssl archives
+( cd ../../third_party/boringssl ; mkdir -p build ; cd build ; cmake .. ; make )
+
+# Generate shadow_boringssl.h
+outputs="$(nm -C $ssl_lib)"$'\n'"$(nm -C $crypto_lib)"
+symbols=$(echo "$outputs" | 
+          grep '^[0-9a-f]* [A-Z] ' |               # Only public symbols
+          grep -v ' bssl::' |                      # Filter BoringSSL symbols since they are already namespaced
+          sed 's/(.*//g' |                         # Remove parenthesis from C++ symbols
+          grep '^[0-9a-f]* [A-Z] _' |              # Filter symbols that is not prefixed with '_'
+          sed 's/[0-9a-f]* [A-Z] _\(.*\)/\1/g')    # Extract the symbol names
+
+commit=$(git submodule | grep "boringssl " | awk '{print $1}' | head -n 1)
+
+echo "# Automatically generated by tools/distrib/generate_grpc_shadow_boringssl_symbol_list.sh" > $symbol_list
+echo $commit >> $symbol_list
+echo "$symbols" >> $symbol_list
+
+exit 0
diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/protobuf_generated_well_known_types_embed.cc b/tools/distrib/python/grpcio_tools/grpc_tools/protobuf_generated_well_known_types_embed.cc
deleted file mode 100644
index ba93621e4f..0000000000
--- a/tools/distrib/python/grpcio_tools/grpc_tools/protobuf_generated_well_known_types_embed.cc
+++ /dev/null
@@ -1,328 +0,0 @@
-// Copyright 2017 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// HACK: Embed the generated well_known_types_js.cc to make
-// grpc-tools python package compilation easy.
-#include <google/protobuf/compiler/js/well_known_types_embed.h>
-struct FileToc well_known_types_js[] = {
-{"any.js",
-  "// Protocol Buffers - Google's data interchange format\n"
-  "// Copyright 2008 Google Inc.  All rights reserved.\n"
-  "// https://developers.google.com/protocol-buffers/\n"
-  "//\n"
-  "// Redistribution and use in source and binary forms, with or without\n"
-  "// modification, are permitted provided that the following conditions are\n"
-  "// met:\n"
-  "//\n"
-  "//     * Redistributions of source code must retain the above copyright\n"
-  "// notice, this list of conditions and the following disclaimer.\n"
-  "//     * Redistributions in binary form must reproduce the above\n"
-  "// copyright notice, this list of conditions and the following disclaimer\n"
-  "// in the documentation and/or other materials provided with the\n"
-  "// distribution.\n"
-  "//     * Neither the name of Google Inc. nor the names of its\n"
-  "// contributors may be used to endorse or promote products derived from\n"
-  "// this software without specific prior written permission.\n"
-  "//\n"
-  "// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
-  "// \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
-  "// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
-  "// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n"
-  "// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
-  "// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
-  "// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
-  "// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
-  "// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
-  "// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
-  "// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-  "\n"
-  "/* This code will be inserted into generated code for\n"
-  " * google/protobuf/any.proto. */\n"
-  "\n"
-  "/**\n"
-  " * Returns the type name contained in this instance, if any.\n"
-  " * @return {string|undefined}\n"
-  " */\n"
-  "proto.google.protobuf.Any.prototype.getTypeName = function() {\n"
-  "  return this.getTypeUrl().split('/').pop();\n"
-  "};\n"
-  "\n"
-  "\n"
-  "/**\n"
-  " * Packs the given message instance into this Any.\n"
-  " * @param {!Uint8Array} serialized The serialized data to pack.\n"
-  " * @param {string} name The type name of this message object.\n"
-  " * @param {string=} opt_typeUrlPrefix the type URL prefix.\n"
-  " */\n"
-  "proto.google.protobuf.Any.prototype.pack = function(serialized, name,\n"
-  "                                                    opt_typeUrlPrefix) {\n"
-  "  if (!opt_typeUrlPrefix) {\n"
-  "    opt_typeUrlPrefix = 'type.googleapis.com/';\n"
-  "  }\n"
-  "\n"
-  "  if (opt_typeUrlPrefix.substr(-1) != '/') {\n"
-  "    this.setTypeUrl(opt_typeUrlPrefix + '/' + name);\n"
-  "  } else {\n"
-  "    this.setTypeUrl(opt_typeUrlPrefix + name);\n"
-  "  }\n"
-  "\n"
-  "  this.setValue(serialized);\n"
-  "};\n"
-  "\n"
-  "\n"
-  "/**\n"
-  " * @template T\n"
-  " * Unpacks this Any into the given message object.\n"
-  " * @param {function(Uint8Array):T} deserialize Function that will deserialize\n"
-  " *     the binary data properly.\n"
-  " * @param {string} name The expected type name of this message object.\n"
-  " * @return {?T} If the name matched the expected name, returns the deserialized\n"
-  " *     object, otherwise returns undefined.\n"
-  " */\n"
-  "proto.google.protobuf.Any.prototype.unpack = function(deserialize, name) {\n"
-  "  if (this.getTypeName() == name) {\n"
-  "    return deserialize(this.getValue_asU8());\n"
-  "  } else {\n"
-  "    return null;\n"
-  "  }\n"
-  "};\n"
-},
-{"struct.js",
-  "// Protocol Buffers - Google's data interchange format\n"
-  "// Copyright 2008 Google Inc.  All rights reserved.\n"
-  "// https://developers.google.com/protocol-buffers/\n"
-  "//\n"
-  "// Redistribution and use in source and binary forms, with or without\n"
-  "// modification, are permitted provided that the following conditions are\n"
-  "// met:\n"
-  "//\n"
-  "//     * Redistributions of source code must retain the above copyright\n"
-  "// notice, this list of conditions and the following disclaimer.\n"
-  "//     * Redistributions in binary form must reproduce the above\n"
-  "// copyright notice, this list of conditions and the following disclaimer\n"
-  "// in the documentation and/or other materials provided with the\n"
-  "// distribution.\n"
-  "//     * Neither the name of Google Inc. nor the names of its\n"
-  "// contributors may be used to endorse or promote products derived from\n"
-  "// this software without specific prior written permission.\n"
-  "//\n"
-  "// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
-  "// \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
-  "// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
-  "// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n"
-  "// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
-  "// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
-  "// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
-  "// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
-  "// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
-  "// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
-  "// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-  "\n"
-  "/* This code will be inserted into generated code for\n"
-  " * google/protobuf/struct.proto. */\n"
-  "\n"
-  "/**\n"
-  " * Typedef representing plain JavaScript values that can go into a\n"
-  " *     Struct.\n"
-  " * @typedef {null|number|string|boolean|Array|Object}\n"
-  " */\n"
-  "proto.google.protobuf.JavaScriptValue;\n"
-  "\n"
-  "\n"
-  "/**\n"
-  " * Converts this Value object to a plain JavaScript value.\n"
-  " * @return {?proto.google.protobuf.JavaScriptValue} a plain JavaScript\n"
-  " *     value representing this Struct.\n"
-  " */\n"
-  "proto.google.protobuf.Value.prototype.toJavaScript = function() {\n"
-  "  var kindCase = proto.google.protobuf.Value.KindCase;\n"
-  "  switch (this.getKindCase()) {\n"
-  "    case kindCase.NULL_VALUE:\n"
-  "      return null;\n"
-  "    case kindCase.NUMBER_VALUE:\n"
-  "      return this.getNumberValue();\n"
-  "    case kindCase.STRING_VALUE:\n"
-  "      return this.getStringValue();\n"
-  "    case kindCase.BOOL_VALUE:\n"
-  "      return this.getBoolValue();\n"
-  "    case kindCase.STRUCT_VALUE:\n"
-  "      return this.getStructValue().toJavaScript();\n"
-  "    case kindCase.LIST_VALUE:\n"
-  "      return this.getListValue().toJavaScript();\n"
-  "    default:\n"
-  "      throw new Error('Unexpected struct type');\n"
-  "  }\n"
-  "};\n"
-  "\n"
-  "\n"
-  "/**\n"
-  " * Converts this JavaScript value to a new Value proto.\n"
-  " * @param {!proto.google.protobuf.JavaScriptValue} value The value to\n"
-  " *     convert.\n"
-  " * @return {!proto.google.protobuf.Value} The newly constructed value.\n"
-  " */\n"
-  "proto.google.protobuf.Value.fromJavaScript = function(value) {\n"
-  "  var ret = new proto.google.protobuf.Value();\n"
-  "  switch (goog.typeOf(value)) {\n"
-  "    case 'string':\n"
-  "      ret.setStringValue(/** @type {string} */ (value));\n"
-  "      break;\n"
-  "    case 'number':\n"
-  "      ret.setNumberValue(/** @type {number} */ (value));\n"
-  "      break;\n"
-  "    case 'boolean':\n"
-  "      ret.setBoolValue(/** @type {boolean} */ (value));\n"
-  "      break;\n"
-  "    case 'null':\n"
-  "      ret.setNullValue(proto.google.protobuf.NullValue.NULL_VALUE);\n"
-  "      break;\n"
-  "    case 'array':\n"
-  "      ret.setListValue(proto.google.protobuf.ListValue.fromJavaScript(\n"
-  "          /** @type{!Array} */ (value)));\n"
-  "      break;\n"
-  "    case 'object':\n"
-  "      ret.setStructValue(proto.google.protobuf.Struct.fromJavaScript(\n"
-  "          /** @type{!Object} */ (value)));\n"
-  "      break;\n"
-  "    default:\n"
-  "      throw new Error('Unexpected struct type.');\n"
-  "  }\n"
-  "\n"
-  "  return ret;\n"
-  "};\n"
-  "\n"
-  "\n"
-  "/**\n"
-  " * Converts this ListValue object to a plain JavaScript array.\n"
-  " * @return {!Array} a plain JavaScript array representing this List.\n"
-  " */\n"
-  "proto.google.protobuf.ListValue.prototype.toJavaScript = function() {\n"
-  "  var ret = [];\n"
-  "  var values = this.getValuesList();\n"
-  "\n"
-  "  for (var i = 0; i < values.length; i++) {\n"
-  "    ret[i] = values[i].toJavaScript();\n"
-  "  }\n"
-  "\n"
-  "  return ret;\n"
-  "};\n"
-  "\n"
-  "\n"
-  "/**\n"
-  " * Constructs a ListValue protobuf from this plain JavaScript array.\n"
-  " * @param {!Array} array a plain JavaScript array\n"
-  " * @return {proto.google.protobuf.ListValue} a new ListValue object\n"
-  " */\n"
-  "proto.google.protobuf.ListValue.fromJavaScript = function(array) {\n"
-  "  var ret = new proto.google.protobuf.ListValue();\n"
-  "\n"
-  "  for (var i = 0; i < array.length; i++) {\n"
-  "    ret.addValues(proto.google.protobuf.Value.fromJavaScript(array[i]));\n"
-  "  }\n"
-  "\n"
-  "  return ret;\n"
-  "};\n"
-  "\n"
-  "\n"
-  "/**\n"
-  " * Converts this Struct object to a plain JavaScript object.\n"
-  " * @return {!Object<string, !proto.google.protobuf.JavaScriptValue>} a plain\n"
-  " *     JavaScript object representing this Struct.\n"
-  " */\n"
-  "proto.google.protobuf.Struct.prototype.toJavaScript = function() {\n"
-  "  var ret = {};\n"
-  "\n"
-  "  this.getFieldsMap().forEach(function(value, key) {\n"
-  "    ret[key] = value.toJavaScript();\n"
-  "  });\n"
-  "\n"
-  "  return ret;\n"
-  "};\n"
-  "\n"
-  "\n"
-  "/**\n"
-  " * Constructs a Struct protobuf from this plain JavaScript object.\n"
-  " * @param {!Object} obj a plain JavaScript object\n"
-  " * @return {proto.google.protobuf.Struct} a new Struct object\n"
-  " */\n"
-  "proto.google.protobuf.Struct.fromJavaScript = function(obj) {\n"
-  "  var ret = new proto.google.protobuf.Struct();\n"
-  "  var map = ret.getFieldsMap();\n"
-  "\n"
-  "  for (var property in obj) {\n"
-  "    var val = obj[property];\n"
-  "    map.set(property, proto.google.protobuf.Value.fromJavaScript(val));\n"
-  "  }\n"
-  "\n"
-  "  return ret;\n"
-  "};\n"
-},
-{"timestamp.js",
-  "// Protocol Buffers - Google's data interchange format\n"
-  "// Copyright 2008 Google Inc.  All rights reserved.\n"
-  "// https://developers.google.com/protocol-buffers/\n"
-  "//\n"
-  "// Redistribution and use in source and binary forms, with or without\n"
-  "// modification, are permitted provided that the following conditions are\n"
-  "// met:\n"
-  "//\n"
-  "//     * Redistributions of source code must retain the above copyright\n"
-  "// notice, this list of conditions and the following disclaimer.\n"
-  "//     * Redistributions in binary form must reproduce the above\n"
-  "// copyright notice, this list of conditions and the following disclaimer\n"
-  "// in the documentation and/or other materials provided with the\n"
-  "// distribution.\n"
-  "//     * Neither the name of Google Inc. nor the names of its\n"
-  "// contributors may be used to endorse or promote products derived from\n"
-  "// this software without specific prior written permission.\n"
-  "//\n"
-  "// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
-  "// \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
-  "// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
-  "// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n"
-  "// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
-  "// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
-  "// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
-  "// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
-  "// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
-  "// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
-  "// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-  "\n"
-  "/* This code will be inserted into generated code for\n"
-  " * google/protobuf/timestamp.proto. */\n"
-  "\n"
-  "/**\n"
-  " * Returns a JavaScript 'Date' object corresponding to this Timestamp.\n"
-  " * @return {!Date}\n"
-  " */\n"
-  "proto.google.protobuf.Timestamp.prototype.toDate = function() {\n"
-  "  var seconds = this.getSeconds();\n"
-  "  var nanos = this.getNanos();\n"
-  "\n"
-  "  return new Date((seconds * 1000) + (nanos / 1000000));\n"
-  "};\n"
-  "\n"
-  "\n"
-  "/**\n"
-  " * Sets the value of this Timestamp object to be the given Date.\n"
-  " * @param {!Date} value The value to set.\n"
-  " */\n"
-  "proto.google.protobuf.Timestamp.prototype.fromDate = function(value) {\n"
-  "  var millis = value.getTime();\n"
-  "  this.setSeconds(Math.floor(value.getTime() / 1000));\n"
-  "  this.setNanos(value.getMilliseconds() * 1000000);\n"
-  "};\n"
-},
-  {NULL, NULL}  // Terminate the list.
-};
diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py
index ccb69a8ebc..581dab3b4e 100644
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.15.0.dev0'
+VERSION = '1.16.0.dev0'
diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py
index c6bcee497f..c13dfe9ade 100644
--- a/tools/distrib/python/grpcio_tools/setup.py
+++ b/tools/distrib/python/grpcio_tools/setup.py
@@ -160,29 +160,7 @@ def extension_modules():
     plugin_sources += [
         os.path.join('grpc_tools', 'main.cc'),
         os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')
-    ]
-
-    #HACK: Substitute the embed.cc, which is a JS to C++
-    #      preprocessor with the generated code.
-    #      The generated code should not be material
-    #      to the parts of protoc we use (it affects
-    #      the JavaScript code generator, supposedly),
-    #      but we need to be cautious about it.
-    cc_files_clone = list(CC_FILES)
-    embed_cc_file = os.path.normpath('google/protobuf/compiler/js/embed.cc')
-    well_known_types_file = os.path.normpath(
-        'google/protobuf/compiler/js/well_known_types_embed.cc')
-    if embed_cc_file in cc_files_clone:
-        cc_files_clone.remove(embed_cc_file)
-    if well_known_types_file in cc_files_clone:
-        cc_files_clone.remove(well_known_types_file)
-        plugin_sources += [
-            os.path.join('grpc_tools',
-                         'protobuf_generated_well_known_types_embed.cc')
-        ]
-    plugin_sources += [
-        os.path.join(CC_INCLUDE, cc_file) for cc_file in cc_files_clone
-    ]
+    ] + [os.path.join(CC_INCLUDE, cc_file) for cc_file in CC_FILES]
 
     plugin_ext = extension.Extension(
         name='grpc_tools._protoc_compiler',