[DO NOT MERGE] Update envoy

Jenkinsfile

@@ -1,6 +1,6 @@
 #!groovy
 
-@Library('testutils@stable-3e4d089')
+@Library('testutils@stable-0ee5fd9')
 
 import org.istio.testutils.Utilities
 import org.istio.testutils.GitUtilities
@@ -32,6 +32,7 @@ def presubmit(gitUtils, bazel) {
       sh('script/check-license-headers')
       sh('script/check-style')
     }
+    sh('bazel clean')
     bazel.updateBazelRc()
     stage('Bazel Fetch') {
       bazel.fetch('-k //...')

WORKSPACE

@@ -45,30 +45,32 @@ load(
 
 mixer_client_repositories()
 
-# Workaround for Bazel > 0.4.0 since it needs newer protobuf.bzl from:
-# https://github.com/google/protobuf/pull/2246
-# Do not use this git_repository for anything else than protobuf.bzl
-new_git_repository(
-    name = "protobuf_bzl",
-    # Injecting an empty BUILD file to prevent using any build target
-    build_file_content = "",
-    commit = "05090726144b6e632c50f47720ff51049bfcbef6",
-    remote = "https://github.com/google/protobuf.git",
-)
-
 load(
     "@mixerclient_git//:repositories.bzl",
     "mixerapi_repositories",
 )
 
-mixerapi_repositories(protobuf_repo="@protobuf_bzl//")
+mixerapi_repositories()
 
-load(
-    "//src/envoy:repositories.bzl",
-    "envoy_repositories",
+load("//src/envoy:repositories.bzl", "lightstep_repositories")
+
+lightstep_repositories()
+
+# Bind BoringSSL for Envoy
+bind(
+    name = "ssl",
+    actual = "@boringssl//:ssl",
 )
 
-envoy_repositories()
+git_repository(
+    name = "envoy",
+    remote = "https://github.com/lyft/envoy.git",
+    commit = "060cb67f0772a425a8ceaf30d28421967d69c0c6",
+)
+
+load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
+
+envoy_dependencies(skip_targets=["googletest", "protobuf", "protoc", "lightstep", "ssl"])
 
 new_http_archive(
     name = "docker_ubuntu",

repositories.bzl

@@ -17,7 +17,7 @@
 def boringssl_repositories(bind=True):
     native.git_repository(
         name = "boringssl",
-        commit = "12c35d69008ae6b8486e435447445240509f7662",  # 2016-10-24
+        commit = "16efcb2dba4690b9940d9b95ef703f1bbd07494d",  # 2017-03-20
         remote = "https://boringssl.googlesource.com/boringssl",
     )
 

src/envoy/mixer/config.h

@@ -15,7 +15,9 @@
 
 #pragma once
 
-#include "precompiled/precompiled.h"
+#include <map>
+#include <string>
+#include <vector>
 
 #include "envoy/json/json_object.h"
 #include "include/attribute.h"

src/envoy/mixer/http_control.h

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "precompiled/precompiled.h"
+#include <memory>
 
 #include "common/common/logger.h"
 #include "common/http/headers.h"

src/envoy/mixer/http_filter.cc

@@ -13,8 +13,6 @@
  * limitations under the License.
  */
 
-#include "precompiled/precompiled.h"
-
 #include "common/common/base64.h"
 #include "common/common/logger.h"
 #include "common/http/headers.h"

src/envoy/mixer/utils.h

@@ -15,7 +15,8 @@
 
 #pragma once
 
-#include "precompiled/precompiled.h"
+#include <map>
+#include <string>
 
 #include "common/http/headers.h"
 #include "envoy/json/json_object.h"