Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ envoy_cc_binary(
visibility = ["//visibility:public"],
deps = [
"//extensions/access_log_policy:access_log_policy_lib",
"//extensions/metadata_exchange:metadata_exchange_lib",
"//extensions/stackdriver:stackdriver_plugin",
"//source/extensions/common/workload_discovery:api_lib", # Experimental: WIP
"//source/extensions/filters/http/alpn:config_lib",
Expand Down
11 changes: 2 additions & 9 deletions Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ TOP := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
SHELL := /bin/bash
BAZEL_STARTUP_ARGS ?=
BAZEL_BUILD_ARGS ?=
BAZEL_TARGETS ?= //... -extensions:metadata_exchange.wasm
BAZEL_TARGETS ?= //...
# Don't build Debian packages and Docker images in tests.
BAZEL_TEST_TARGETS ?= ${BAZEL_TARGETS}
E2E_TEST_TARGETS ?= $$(go list ./...)
Expand Down Expand Up @@ -83,14 +83,7 @@ build_envoy_asan: BAZEL_CONFIG_CURRENT = $(BAZEL_CONFIG_ASAN)
build_envoy_asan: BAZEL_TARGETS = //:envoy
build_envoy_asan: build

build_wasm:
export PATH=$(PATH) CC=$(CC) CXX=$(CXX) && bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) $(BAZEL_CONFIG_REL) //extensions:metadata_exchange.wasm
export PATH=$(PATH) CC=$(CC) CXX=$(CXX) && bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) $(BAZEL_CONFIG_REL) @envoy//test/tools/wee8_compile:wee8_compile_tool
bazel-bin/external/envoy/test/tools/wee8_compile/wee8_compile_tool bazel-bin/extensions/metadata_exchange.wasm bazel-bin/extensions/metadata_exchange.compiled.wasm

# NOTE: build_wasm has to happen before build_envoy, since the integration test references bazel-bin symbol link for envoy binary,
# which will be overwritten if wasm build happens after envoy.
check_wasm: build_wasm build_envoy
check_wasm:
@true

clean:
Expand Down
58 changes: 0 additions & 58 deletions extensions/BUILD

This file was deleted.

50 changes: 0 additions & 50 deletions extensions/metadata_exchange/BUILD

This file was deleted.

34 changes: 0 additions & 34 deletions extensions/metadata_exchange/config.cc

This file was deleted.

66 changes: 0 additions & 66 deletions extensions/metadata_exchange/config.pb.html

This file was deleted.

36 changes: 0 additions & 36 deletions extensions/metadata_exchange/config.proto

This file was deleted.

Loading