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
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ bind(
# 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
#
# Note: this is needed by release builder to resolve envoy dep sha to tag.
# Commit date: 2022-04-13
ENVOY_SHA = "03efacf2f9bc10bf92c61491274c4ba9ff0ad1bd"
# Commit date: 2022-04-15
ENVOY_SHA = "12e740d76f330242142a8940d33e7cf41584e35c"

ENVOY_SHA256 = "4cd1a1b44dd0f16dde993b0209d38298eb860654fabf8a38aff4e74c6ba2af62"
ENVOY_SHA256 = "935316c27bbf4e04374bb5fb8e44827b9bcdbc9cc73179a9f62cebeb754fa0cd"

ENVOY_ORG = "envoyproxy"

Expand Down
36 changes: 36 additions & 0 deletions bazel/platform_mappings
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
flags:
--cpu=arm64-v8a
--crosstool_top=//external:android/crosstool
@envoy//bazel:android_aarch64

--cpu=armeabi-v7a
--crosstool_top=//external:android/crosstool
@envoy//bazel:android_armeabi

--cpu=x86
--crosstool_top=//external:android/crosstool
@envoy//bazel:android_x86

--cpu=x86_64
--crosstool_top=//external:android/crosstool
@envoy//bazel:android_x86_64

--cpu=darwin_x86_64
--apple_platform_type=macos
@envoy//bazel:macos_x86_64

--cpu=darwin_arm64
--apple_platform_type=macos
@envoy//bazel:macos_arm64

--cpu=ios_x86_64
--apple_platform_type=ios
@envoy//bazel:ios_x86_64_platform

--cpu=ios_sim_arm64
--apple_platform_type=ios
@envoy//bazel:ios_sim_arm64

--cpu=ios_arm64
--apple_platform_type=ios
@envoy//bazel:ios_arm64_platform
1 change: 1 addition & 0 deletions envoy.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ build --incompatible_strict_action_env
build --host_force_python=PY3
build --java_runtime_version=remotejdk_11
build --tool_java_runtime_version=remotejdk_11
build --platform_mappings=bazel/platform_mappings

build --enable_platform_specific_config

Expand Down