remove unnecessary proto from the SDK

Signed-off-by: wangbaiping/wbpcode <[email protected]>

Author: wbpcode

BUILD

@@ -1,5 +1,4 @@
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 
 licenses(["notice"])  # Apache 2
 
@@ -45,69 +44,30 @@ cc_library(
     visibility = ["//visibility:public"],
 )
 
-cc_proto_library(
-    name = "proxy_wasm_intrinsics_cc_proto",
-    deps = [":proxy_wasm_intrinsics_proto"],
-)
-
-proto_library(
-    name = "proxy_wasm_intrinsics_proto",
-    srcs = ["proxy_wasm_intrinsics.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:empty_proto",
-        "@com_google_protobuf//:struct_proto",
-    ],
-)
-
 # include lite protobuf support
 cc_library(
     name = "proxy_wasm_intrinsics_lite",
-    hdrs = ["proxy_wasm_intrinsics_lite.h"],
     copts = ["-std=c++17"],
     defines = ["PROXY_WASM_PROTOBUF_LITE"],
     visibility = ["//visibility:public"],
     deps = [
         ":proxy_wasm_intrinsics",
-        ":proxy_wasm_intrinsics_lite_cc_proto",
         "@com_google_protobuf//:protobuf_lite",
     ],
 )
 
 # include full protobuf support
 cc_library(
     name = "proxy_wasm_intrinsics_full",
-    hdrs = ["proxy_wasm_intrinsics_full.h"],
     copts = ["-std=c++17"],
     defines = ["PROXY_WASM_PROTOBUF_FULL"],
     visibility = ["//visibility:public"],
     deps = [
         ":proxy_wasm_intrinsics",
-        ":proxy_wasm_intrinsics_cc_proto",
         "@com_google_protobuf//:protobuf",
     ],
 )
 
-cc_proto_library(
-    name = "proxy_wasm_intrinsics_lite_cc_proto",
-    deps = [":proxy_wasm_intrinsics_lite_proto"],
-)
-
-proto_library(
-    name = "proxy_wasm_intrinsics_lite_proto",
-    srcs = [
-        "proxy_wasm_intrinsics_lite.proto",
-        "struct_lite.proto",
-    ],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:empty_proto",
-        "@com_google_protobuf//:struct_proto",
-    ],
-)
-
 filegroup(
     name = "proxy_wasm_intrinsics_js",
     srcs = [

Dockerfile-sdk

@@ -1,6 +1,6 @@
 FROM ubuntu:noble
 
 COPY *.sh /
-COPY *.cc *.h *.js *.proto Makefile* /sdk/
+COPY *.cc *.h *.js Makefile* /sdk/
 
 RUN ./sdk_container.sh

Makefile

@@ -7,13 +7,10 @@ endif
 PROTOBUF ?= none
 ifeq ($(PROTOBUF), full)
   PROTO_DEPS := protobuf
-  PROTO_OPTS := -DPROXY_WASM_PROTOBUF_FULL=1 \
-		${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.pb.cc
+  PROTO_OPTS := -DPROXY_WASM_PROTOBUF_FULL=1
 else ifeq ($(PROTOBUF), lite)
   PROTO_DEPS := protobuf-lite
-  PROTO_OPTS := -DPROXY_WASM_PROTOBUF_LITE=1 \
-		${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics_lite.pb.cc \
-		${PROXY_WASM_CPP_SDK}/struct_lite.pb.cc
+  PROTO_OPTS := -DPROXY_WASM_PROTOBUF_LITE=1
 else
   PROTO_DEPS :=
   PROTO_OPTS :=
@@ -48,10 +45,3 @@ debug-deps:
 
 clean:
 	rm *.wasm
-
-# NOTE: How to regenerate .pb.h and .pb.cc files for a protobuf update:
-# - download + extract protobuf release (currently v26.1)
-# - regenerate:
-#   ./bin/protoc --cpp_out=../ -I../ -Iinclude/google/protobuf/ ../struct_lite.proto
-#   ./bin/protoc --cpp_out=../ -I../ -Iinclude/google/protobuf/ ../proxy_wasm_intrinsics_lite.proto
-#   ./bin/protoc --cpp_out=../ -I../ -Iinclude/google/protobuf/ ../proxy_wasm_intrinsics.proto

example/http_proto_example.cc

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "google/protobuf/struct.pb.h"
+
 #include "proxy_wasm_intrinsics.h"
 
 class MyRootContext : public RootContext {

proxy_wasm_intrinsics.h

@@ -38,10 +38,8 @@
 #include "proxy_wasm_externs.h"
 #ifdef PROXY_WASM_PROTOBUF_FULL
 #define PROXY_WASM_PROTOBUF 1
-#include "proxy_wasm_intrinsics.pb.h"
 #endif
 #ifdef PROXY_WASM_PROTOBUF_LITE
 #define PROXY_WASM_PROTOBUF 1
-#include "proxy_wasm_intrinsics_lite.pb.h"
 #endif
 #include "proxy_wasm_api.h"