wasm: use Bazel rules from Proxy-Wasm C++ Host.

Signed-off-by: Piotr Sikora <[email protected]>

Author: PiotrSikora

bazel/external/proxy_wasm_cpp_host.BUILD

@@ -847,10 +847,7 @@ def _proxy_wasm_cpp_sdk():
     external_http_archive(name = "proxy_wasm_cpp_sdk")
 
 def _proxy_wasm_cpp_host():
-    external_http_archive(
-        name = "proxy_wasm_cpp_host",
-        build_file = "@envoy//bazel/external:proxy_wasm_cpp_host.BUILD",
-    )
+    external_http_archive(name = "proxy_wasm_cpp_host")
 
 def _emscripten_toolchain():
     external_http_archive(
@@ -963,6 +960,10 @@ def _com_github_wasm_c_api():
         name = "com_github_wasm_c_api",
         build_file = "@envoy//bazel/external:wasm-c-api.BUILD",
     )
+    native.bind(
+        name = "wasmtime",
+        actual = "@com_github_wasm_c_api//:wasmtime_lib",
+    )
 
 def _rules_fuzzing():
     external_http_archive(

bazel/repositories.bzl

@@ -965,8 +965,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "WebAssembly for Proxies (C++ host implementation)",
         project_desc = "WebAssembly for Proxies (C++ host implementation)",
         project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host",
-        version = "c3712617b28c69ff205e8302f70942c06e35f4e2",
-        sha256 = "60dd1a7f4b51e20ee1620a7106b09adf06763333c907076f884aeb37b741c17d",
+        version = "81200b3e8c46a52ee85aadf85f734cf0b5f5b964",
+        sha256 = "5f22c87c90575771ecb2a996fe4bd0cca762ade31b249952e45cc910b6d3de31",
         strip_prefix = "proxy-wasm-cpp-host-{version}",
         urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
         use_category = ["dataplane_ext"],
@@ -982,7 +982,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
             "envoy.wasm.runtime.wavm",
             "envoy.wasm.runtime.wasmtime",
         ],
-        release_date = "2021-06-01",
+        release_date = "2021-06-05",
         cpe = "N/A",
     ),
     proxy_wasm_rust_sdk = dict(

bazel/repository_locations.bzl

@@ -14,7 +14,7 @@ envoy_cc_library(
         "wasm_runtime_factory.h",
     ],
     deps = [
-        "@proxy_wasm_cpp_host//:include",
+        "@proxy_wasm_cpp_host//:wasm_vm_headers",
     ],
 )
 
@@ -44,7 +44,7 @@ envoy_cc_library(
         "//source/extensions/filters/common/expr:evaluator_lib",
         "@com_google_cel_cpp//eval/public:activation",
         "@envoy_api//envoy/extensions/wasm/v3:pkg_cc_proto",
-        "@proxy_wasm_cpp_host//:include",
+        "@proxy_wasm_cpp_host//:headers",
         "@proxy_wasm_cpp_sdk//:common_lib",
     ],
 )
@@ -91,7 +91,7 @@ envoy_cc_library(
         "@com_google_cel_cpp//eval/public:cel_value",
         "@com_google_cel_cpp//eval/public:value_export_util",
         "@envoy_api//envoy/extensions/wasm/v3:pkg_cc_proto",
-        "@proxy_wasm_cpp_host//:common_lib",
+        "@proxy_wasm_cpp_host//:base_lib",
         "@proxy_wasm_cpp_host//:null_lib",
     ] + select(
         {

source/extensions/common/wasm/BUILD

@@ -14,6 +14,7 @@ envoy_cc_extension(
     deps = [
         "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
+        "@proxy_wasm_cpp_host//:base_lib",
         "@proxy_wasm_cpp_host//:null_lib",
     ],
 )

source/extensions/wasm_runtime/null/BUILD

@@ -11,11 +11,11 @@ envoy_extension_package()
 
 envoy_cc_extension(
     name = "config",
-    srcs = ["config.cc"],
-    deps = [
+    srcs = envoy_select_wasm_v8(["config.cc"]),
+    deps = envoy_select_wasm_v8([
         "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
-    ] + envoy_select_wasm_v8([
+        "@proxy_wasm_cpp_host//:base_lib",
         "@proxy_wasm_cpp_host//:v8_lib",
     ]),
 )

source/extensions/wasm_runtime/v8/BUILD

@@ -11,11 +11,11 @@ envoy_extension_package()
 
 envoy_cc_extension(
     name = "config",
-    srcs = ["config.cc"],
-    deps = [
+    srcs = envoy_select_wasm_wamr(["config.cc"]),
+    deps = envoy_select_wasm_wamr([
         "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
-    ] + envoy_select_wasm_wamr([
+        "@proxy_wasm_cpp_host//:base_lib",
         "@proxy_wasm_cpp_host//:wamr_lib",
     ]),
 )

source/extensions/wasm_runtime/wamr/BUILD

@@ -11,11 +11,11 @@ envoy_extension_package()
 
 envoy_cc_extension(
     name = "config",
-    srcs = ["config.cc"],
-    deps = [
+    srcs = envoy_select_wasm_wasmtime(["config.cc"]),
+    deps = envoy_select_wasm_wasmtime([
         "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
-    ] + envoy_select_wasm_wasmtime([
+        "@proxy_wasm_cpp_host//:base_lib",
         "@proxy_wasm_cpp_host//:wasmtime_lib",
     ]),
 )

source/extensions/wasm_runtime/wasmtime/BUILD

@@ -11,11 +11,11 @@ envoy_extension_package()
 
 envoy_cc_extension(
     name = "config",
-    srcs = ["config.cc"],
-    deps = [
+    srcs = envoy_select_wasm_wavm(["config.cc"]),
+    deps = envoy_select_wasm_wavm([
         "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
-    ] + envoy_select_wasm_wavm([
+        "@proxy_wasm_cpp_host//:base_lib",
         "@proxy_wasm_cpp_host//:wavm_lib",
     ]),
 )