wasmtime: split "prefixed_wasmtime" into a separate target.

BUILD

@@ -128,6 +128,24 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "wasmtime_lib",
+    srcs = [
+        "src/common/types.h",
+        "src/wasmtime/types.h",
+        "src/wasmtime/wasmtime.cc",
+    ],
+    hdrs = ["include/proxy-wasm/wasmtime.h"],
+    defines = [
+        "PROXY_WASM_HAS_RUNTIME_WASMTIME",
+        "PROXY_WASM_HOST_ENGINE_WASMTIME",
+    ],
+    deps = [
+        ":wasm_vm_headers",
+        "//external:wasmtime",
+    ],
+)
+
 genrule(
     name = "prefixed_wasmtime_sources",
     srcs = [
@@ -141,41 +159,29 @@ genrule(
     cmd = """
         for file in $(SRCS); do
            sed -e 's/wasm_/wasmtime_wasm_/g' \
+               -e 's/include\\/wasm.h/include\\/prefixed_wasm.h/g' \
                -e 's/wasmtime\\/types.h/wasmtime\\/prefixed_types.h/g' \
            $$file >$(@D)/$$(dirname $$file)/prefixed_$$(basename $$file)
         done
         """,
 )
 
 cc_library(
-    name = "wasmtime_lib",
+    name = "prefixed_wasmtime_lib",
     srcs = [
         "src/common/types.h",
-    ] + select({
-        "@proxy_wasm_cpp_host//bazel:multiengine": [
-            "src/wasmtime/prefixed_types.h",
-            "src/wasmtime/prefixed_wasmtime.cc",
-        ],
-        "//conditions:default": [
-            "src/wasmtime/types.h",
-            "src/wasmtime/wasmtime.cc",
-        ],
-    }),
+        "src/wasmtime/prefixed_types.h",
+        "src/wasmtime/prefixed_wasmtime.cc",
+    ],
     hdrs = ["include/proxy-wasm/wasmtime.h"],
     defines = [
         "PROXY_WASM_HAS_RUNTIME_WASMTIME",
         "PROXY_WASM_HOST_ENGINE_WASMTIME",
     ],
     deps = [
         ":wasm_vm_headers",
-    ] + select({
-        "@proxy_wasm_cpp_host//bazel:multiengine": [
-            "//external:prefixed_wasmtime",
-        ],
-        "//conditions:default": [
-            "//external:wasmtime",
-        ],
-    }),
+        "//external:prefixed_wasmtime",
+    ],
 )
 
 cc_library(
@@ -211,6 +217,7 @@ cc_library(
         [":wamr_lib"],
     ) + proxy_wasm_select_engine_wasmtime(
         [":wasmtime_lib"],
+        [":prefixed_wasmtime_lib"],
     ) + proxy_wasm_select_engine_wavm(
         [":wavm_lib"],
     ),

bazel/external/wasm-c-api.BUILD

@@ -9,7 +9,6 @@ cc_library(
     hdrs = [
         "include/wasm.h",
     ],
-    include_prefix = "wasmtime",
     deps = [
         "@com_github_bytecodealliance_wasmtime//:rust_c_api",
     ],
@@ -21,7 +20,7 @@ genrule(
         "include/wasm.h",
     ],
     outs = [
-        "wasmtime/include/wasm.h",
+        "include/prefixed_wasm.h",
     ],
     cmd = """
         sed -e 's/\\ wasm_/\\ wasmtime_wasm_/g' \

bazel/select.bzl

@@ -33,10 +33,10 @@ def proxy_wasm_select_engine_wamr(xs):
         "//conditions:default": [],
     })
 
-def proxy_wasm_select_engine_wasmtime(xs):
+def proxy_wasm_select_engine_wasmtime(xs, xp):
     return select({
         "@proxy_wasm_cpp_host//bazel:engine_wasmtime": xs,
-        "@proxy_wasm_cpp_host//bazel:multiengine": xs,
+        "@proxy_wasm_cpp_host//bazel:multiengine": xp,
         "//conditions:default": [],
     })
 

src/wasmtime/types.h

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

src/wasmtime/wasmtime.cc

@@ -26,7 +26,7 @@
 
 #include "src/wasmtime/types.h"
 
-#include "wasmtime/include/wasm.h"
+#include "include/wasm.h"
 
 namespace proxy_wasm {
 namespace wasmtime {