envoyproxy · htuch · Apr 20, 2017
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--build-id=0x${GIT_COMMIT} -static-libstdc++ -st
 include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${PROJECT_BINARY_DIR}/source)
 include_directories(${PROJECT_SOURCE_DIR}/source)
-include_directories(${ENVOY_SPDLOG_INCLUDE_DIR})
+include_directories(SYSTEM ${ENVOY_SPDLOG_INCLUDE_DIR})
 include_directories(SYSTEM ${ENVOY_PROTOBUF_INCLUDE_DIR})
 
 add_subdirectory(source)

diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl
@@ -12,7 +12,6 @@ def envoy_copts(repository):
         "-Woverloaded-virtual",
         "-Wold-style-cast",
         "-std=c++0x",
-        "-includeprecompiled/precompiled.h",
     ] + select({
         # Bazel adds an implicit -DNDEBUG for opt.
         repository + "//bazel:opt_build": [],
@@ -75,7 +74,7 @@ def envoy_cc_library(name,
         visibility = visibility,
         deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + [
             repository + "//include/envoy/common:base_includes",
-            repository + "//source/precompiled:precompiled_includes",
+            envoy_external_dep_path('spdlog'),
         ],
         include_prefix = envoy_include_prefix(PACKAGE_NAME),
         alwayslink = 1,
@@ -142,9 +141,7 @@ def envoy_cc_binary(name,
         malloc = tcmalloc_external_dep(repository),
         # See above comment on MD5 hash.
         stamp = 0,
-        deps = deps + [
-            repository + "//source/precompiled:precompiled_includes",
-        ],
+        deps = deps,
     )
 
 # Envoy C++ test targets should be specified with this function.
@@ -197,11 +194,11 @@ def envoy_cc_test_library(name,
         srcs = srcs,
         hdrs = hdrs,
         data = data,
-        copts = envoy_copts(repository) + ["-includetest/precompiled/precompiled_test.h"],
+        copts = envoy_copts(repository),
         testonly = 1,
         deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + [
-            repository + "//source/precompiled:precompiled_includes",
-            repository + "//test/precompiled:precompiled_includes",
+            envoy_external_dep_path('googletest'),
+            repository + "//test/test_common:printers_includes",
         ],
         tags = tags,
         alwayslink = 1,

diff --git a/bazel/gen_sh_test_runner.sh b/bazel/gen_sh_test_runner.sh
@@ -18,6 +18,8 @@ done
   cat << EOF
 #include "test/test_common/environment.h"
 
+#include "gtest/gtest.h"
+
 TEST(ShTest, ${TEST_NAME}) {
   TestEnvironment::exec({${EXEC_ARGS}});
 }

diff --git a/include/envoy/access_log/access_log.h b/include/envoy/access_log/access_log.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <memory>
+#include <string>
+
 #include "envoy/common/pure.h"
 #include "envoy/filesystem/filesystem.h"
 

diff --git a/include/envoy/api/api.h b/include/envoy/api/api.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <memory>
+#include <string>
+
 #include "envoy/event/dispatcher.h"
 #include "envoy/filesystem/filesystem.h"
 #include "envoy/thread/thread.h"

diff --git a/include/envoy/buffer/buffer.h b/include/envoy/buffer/buffer.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <cstdint>
+#include <memory>
+#include <string>
+
 #include "envoy/common/pure.h"
 
 namespace Buffer {

diff --git a/include/envoy/common/exception.h b/include/envoy/common/exception.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <stdexcept>
+#include <string>
+
 /**
  * Base class for all envoy exceptions.
  */

diff --git a/include/envoy/common/time.h b/include/envoy/common/time.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <chrono>
+
 #include "envoy/common/pure.h"
 
 /**

diff --git a/include/envoy/event/deferred_deletable.h b/include/envoy/event/deferred_deletable.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 namespace Event {
 
 /**

diff --git a/include/envoy/event/dispatcher.h b/include/envoy/event/dispatcher.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <cstdint>
+#include <functional>
+#include <memory>
+
 #include "envoy/event/file_event.h"
 #include "envoy/event/signal.h"
 #include "envoy/event/timer.h"

diff --git a/include/envoy/event/file_event.h b/include/envoy/event/file_event.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <cstdint>
+#include <functional>
+#include <memory>
+
 #include "envoy/common/pure.h"
 
 namespace Event {

diff --git a/include/envoy/event/signal.h b/include/envoy/event/signal.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <functional>
+#include <memory>
+
 namespace Event {
 
 /**

diff --git a/include/envoy/event/timer.h b/include/envoy/event/timer.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <chrono>
+#include <functional>
+#include <memory>
+
 #include "envoy/common/pure.h"
 
 namespace Event {

diff --git a/include/envoy/filesystem/filesystem.h b/include/envoy/filesystem/filesystem.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
+
 #include "envoy/common/pure.h"
 
 namespace Filesystem {

diff --git a/include/envoy/grpc/rpc_channel.h b/include/envoy/grpc/rpc_channel.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <string>
+
 #include "envoy/common/optional.h"
 #include "envoy/common/pure.h"
 #include "envoy/http/header_map.h"

diff --git a/include/envoy/http/access_log.h b/include/envoy/http/access_log.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <string>
+
 #include "envoy/common/optional.h"
 #include "envoy/common/pure.h"
 #include "envoy/common/time.h"

diff --git a/include/envoy/http/async_client.h b/include/envoy/http/async_client.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <chrono>
+#include <memory>
+
 #include "envoy/common/optional.h"
 #include "envoy/http/message.h"
 

diff --git a/include/envoy/http/codec.h b/include/envoy/http/codec.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+#include <memory>
+
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/pure.h"
 #include "envoy/http/header_map.h"

diff --git a/include/envoy/http/conn_pool.h b/include/envoy/http/conn_pool.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <functional>
+#include <memory>
+
 #include "envoy/common/pure.h"
 #include "envoy/event/deferred_deletable.h"
 #include "envoy/http/codec.h"

diff --git a/include/envoy/http/filter.h b/include/envoy/http/filter.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
+
 #include "envoy/event/dispatcher.h"
 #include "envoy/http/access_log.h"
 #include "envoy/http/codec.h"

diff --git a/include/envoy/http/header_map.h b/include/envoy/http/header_map.h
@@ -1,5 +1,12 @@
 #pragma once
 
+#include <string.h>
+
+#include <algorithm>
+#include <cstdint>
+#include <memory>
+#include <string>
+
 #include "envoy/common/pure.h"
 
 namespace Http {

diff --git a/include/envoy/http/message.h b/include/envoy/http/message.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <memory>
+#include <string>
+
 #include "envoy/buffer/buffer.h"
 #include "envoy/http/header_map.h"
 

diff --git a/include/envoy/init/init.h b/include/envoy/init/init.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <functional>
+
 #include "envoy/common/pure.h"
 
 namespace Init {

diff --git a/include/envoy/json/json_object.h b/include/envoy/json/json_object.h
@@ -1,5 +1,11 @@
 #pragma once
 
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "envoy/common/exception.h"
 #include "envoy/common/pure.h"
 

diff --git a/include/envoy/local_info/local_info.h b/include/envoy/local_info/local_info.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "envoy/common/pure.h"
 #include "envoy/network/address.h"
 

diff --git a/include/envoy/mongo/bson.h b/include/envoy/mongo/bson.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <array>
+#include <list>
+#include <memory>
+#include <string>
+
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/pure.h"
 

diff --git a/include/envoy/mongo/codec.h b/include/envoy/mongo/codec.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <list>
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "envoy/mongo/bson.h"
 
 /**

diff --git a/include/envoy/network/address.h b/include/envoy/network/address.h
@@ -1,5 +1,13 @@
 #pragma once
 
+#include <sys/socket.h>
+#include <sys/types.h>
+
+#include <array>
+#include <cstdint>
+#include <memory>
+#include <string>
+
 #include "envoy/common/pure.h"
 
 namespace Network {

diff --git a/include/envoy/network/connection.h b/include/envoy/network/connection.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <cstdint>
+#include <memory>
+#include <string>
+
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/pure.h"
 #include "envoy/event/deferred_deletable.h"

diff --git a/include/envoy/network/connection_handler.h b/include/envoy/network/connection_handler.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+#include <memory>
+
 #include "envoy/network/connection.h"
 #include "envoy/network/filter.h"
 #include "envoy/network/listen_socket.h"

diff --git a/include/envoy/network/dns.h b/include/envoy/network/dns.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <functional>
+#include <list>
+#include <memory>
+#include <string>
+
 #include "envoy/common/pure.h"
 #include "envoy/network/address.h"
 

diff --git a/include/envoy/network/filter.h b/include/envoy/network/filter.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "envoy/buffer/buffer.h"
 #include "envoy/upstream/host_description.h"
 

diff --git a/include/envoy/network/listen_socket.h b/include/envoy/network/listen_socket.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "envoy/common/pure.h"
 #include "envoy/network/address.h"
 

diff --git a/include/envoy/network/listener.h b/include/envoy/network/listener.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <cstdint>
+#include <memory>
+#include <string>
+
 #include "envoy/common/exception.h"
 #include "envoy/network/connection.h"
 

diff --git a/include/envoy/ratelimit/ratelimit.h b/include/envoy/ratelimit/ratelimit.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <chrono>
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "envoy/common/optional.h"
 #include "envoy/common/pure.h"
 #include "envoy/tracing/context.h"

diff --git a/include/envoy/redis/codec.h b/include/envoy/redis/codec.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/exception.h"
 

diff --git a/include/envoy/redis/command_splitter.h b/include/envoy/redis/command_splitter.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "envoy/common/pure.h"
 #include "envoy/redis/codec.h"