Merge pull request proxy-wasm#1 from lum1n0us/envoy-wamr-integration

Compile WAMR from Source Code

Author: YaoLe

BUILD

@@ -23,8 +23,9 @@ cc_library(
             "src/**/*.h",
         ],
         exclude = [
-            "src/**/wavm*",
             "src/**/v8*",
+            "src/**/wasmtime*",
+            "src/**/wavm*",
         ],
     ),
     hdrs = glob(["src/**/*.h"]),
@@ -34,7 +35,6 @@ cc_library(
         "@boringssl//:crypto",
         "@com_google_protobuf//:protobuf_lite",
         "@proxy_wasm_cpp_sdk//:api_lib",
-        "@wamr//:wamr_lib",
-        "@wasm_c_api//:wasmtime_lib",
+        "@wamr//:libiwasm",
     ],
 )

WORKSPACE

@@ -7,3 +7,7 @@ proxy_wasm_cpp_host_repositories()
 load("@proxy_wasm_cpp_host//bazel:dependencies.bzl", "proxy_wasm_cpp_host_dependencies")
 
 proxy_wasm_cpp_host_dependencies()
+
+load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
+
+rules_foreign_cc_dependencies()

bazel/external/wamr.BUILD

@@ -1,24 +1,24 @@
 licenses(["notice"])  # Apache 2
 
-package(default_visibility = ["//visibility:public"])
+load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
 
-cc_import(
-    name = "linklib",
-    shared_library = "library/linux-classic_interp-multi_module-dbg/libiwasm.so",
-)
+package(default_visibility = ["//visibility:public"])
 
-cc_library(
-    name = "headlib",
-    hdrs = glob(["include/*.h"]),
-    srcs = glob(["include/*.c"]),
-    include_prefix = "wamr",
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+    visibility = ["//visibility:public"],
 )
 
-cc_library(
-    name = "wamr_lib",
-    defines = ["WASM_WAMR"],
-    deps = [
-        "linklib",
-        "headlib",
-    ],
+cmake(
+    name = "libiwasm",
+    cache_entries = {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "On",
+        "WAMR_BUILD_AOT": "0",
+        "WAMR_BUILD_SIMD": "0",
+    },
+    lib_source = ":srcs",
+    out_shared_libs = ["libiwasm.so"],
+    working_directory = "product-mini/platforms/linux"
 )

bazel/repositories.bzl

@@ -52,6 +52,19 @@ def proxy_wasm_cpp_host_repositories():
         url = "https://github.com/lum1n0us/wasm-micro-runtime/releases/download/WAMR-01-29-2021/wamr_pre_release.zip",
     )
 
+    http_archive(
+        name = "wamr",
+        build_file = "@proxy_wasm_cpp_host//bazel/external:wamr.BUILD",
+        sha256 = "88cd7145d7098daacfb0da51548327f4e5303d17ea27611cde6f47c6f7b68059",
+        url = "https://github.com/lum1n0us/wasm-micro-runtime/releases/download/WAMR-01-29-2021/source.zip",
+    )
+
+    # native.new_local_repository(
+    #     name = "wamr",
+    #     build_file = "@proxy_wasm_cpp_host//bazel/external:wamr.BUILD",
+    #     path = "/source/wamr",
+    # )
+
     http_archive(
         name = "wasm_c_api",
         build_file = "@proxy_wasm_cpp_host//bazel/external:wasm-c-api.BUILD",
@@ -73,3 +86,10 @@ def proxy_wasm_cpp_host_repositories():
         strip_prefix = "protobuf-655310ca192a6e3a050e0ca0b7084a2968072260",
         url = "https://github.com/protocolbuffers/protobuf/archive/655310ca192a6e3a050e0ca0b7084a2968072260.tar.gz",
     )
+
+    http_archive(
+        name = "rules_foreign_cc",
+        sha256 = "d54742ffbdc6924f222d2179f0e10e911c5c659c4ae74158e9fe827aad862ac6",
+        strip_prefix = "rules_foreign_cc-0.2.0",
+        url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.2.0.tar.gz",
+    )

src/wamr/types.h

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "src/common/types.h"
-#include "wamr/include/wasm_c_api.h"
+#include "wasm_c_api.h"
 
 namespace proxy_wasm {
 namespace wamr {

src/wamr/wamr.cc

@@ -30,7 +30,7 @@
 #include <vector>
 
 #include "src/wamr/types.h"
-#include "wamr/include/wasm_c_api.h"
+#include "wasm_c_api.h"
 
 namespace proxy_wasm {
 namespace wamr {
@@ -60,7 +60,6 @@ class Wamr : public WasmVm {
 
   Cloneable cloneable() override {
     return Cloneable::CompiledBytecode;
-    ;
   }
   std::unique_ptr<WasmVm> clone() override;
 
@@ -167,7 +166,8 @@ std::unique_ptr<WasmVm> Wamr::clone() {
 
   WasmByteVec stripped;
   clone->module_ =
-      wasm_module_new(store_.get(), getStrippedSource(&stripped) ? stripped.get() : source_.get());
+      wasm_module_new(clone->store_.get(), getStrippedSource(&stripped) ? stripped.get() : source_.get());
+
   return clone;
 }
 
@@ -765,3 +765,5 @@ AbiVersion Wamr::getAbiVersion() {
 std::unique_ptr<WasmVm> createWamrVm() { return std::make_unique<wamr::Wamr>(); }
 
 } // namespace proxy_wasm
+
+