Skip to content

Commit 766af8f

Browse files
author
Eric Van Norman
authored
Test of update_envoy adding mobile platforms. (#3812)
* update_envoy * Add platform_mappings file
1 parent d3b5a88 commit 766af8f

File tree

3 files changed

+40
-3
lines changed

3 files changed

+40
-3
lines changed

WORKSPACE

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ bind(
3838
# 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
3939
#
4040
# Note: this is needed by release builder to resolve envoy dep sha to tag.
41-
# Commit date: 2022-04-13
42-
ENVOY_SHA = "03efacf2f9bc10bf92c61491274c4ba9ff0ad1bd"
41+
# Commit date: 2022-04-15
42+
ENVOY_SHA = "12e740d76f330242142a8940d33e7cf41584e35c"
4343

44-
ENVOY_SHA256 = "4cd1a1b44dd0f16dde993b0209d38298eb860654fabf8a38aff4e74c6ba2af62"
44+
ENVOY_SHA256 = "935316c27bbf4e04374bb5fb8e44827b9bcdbc9cc73179a9f62cebeb754fa0cd"
4545

4646
ENVOY_ORG = "envoyproxy"
4747

bazel/platform_mappings

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
flags:
2+
--cpu=arm64-v8a
3+
--crosstool_top=//external:android/crosstool
4+
@envoy//bazel:android_aarch64
5+
6+
--cpu=armeabi-v7a
7+
--crosstool_top=//external:android/crosstool
8+
@envoy//bazel:android_armeabi
9+
10+
--cpu=x86
11+
--crosstool_top=//external:android/crosstool
12+
@envoy//bazel:android_x86
13+
14+
--cpu=x86_64
15+
--crosstool_top=//external:android/crosstool
16+
@envoy//bazel:android_x86_64
17+
18+
--cpu=darwin_x86_64
19+
--apple_platform_type=macos
20+
@envoy//bazel:macos_x86_64
21+
22+
--cpu=darwin_arm64
23+
--apple_platform_type=macos
24+
@envoy//bazel:macos_arm64
25+
26+
--cpu=ios_x86_64
27+
--apple_platform_type=ios
28+
@envoy//bazel:ios_x86_64_platform
29+
30+
--cpu=ios_sim_arm64
31+
--apple_platform_type=ios
32+
@envoy//bazel:ios_sim_arm64
33+
34+
--cpu=ios_arm64
35+
--apple_platform_type=ios
36+
@envoy//bazel:ios_arm64_platform

envoy.bazelrc

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ build --incompatible_strict_action_env
1818
build --host_force_python=PY3
1919
build --java_runtime_version=remotejdk_11
2020
build --tool_java_runtime_version=remotejdk_11
21+
build --platform_mappings=bazel/platform_mappings
2122

2223
build --enable_platform_specific_config
2324

0 commit comments

Comments
 (0)