patch to my windows build of envoy (plus some of contrib)

malkia_diff.txt

diff --git a/.bazelrc b/.bazelrc
index 637a9a65be..bb77b3fb71 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -430,3 +430,5 @@ build:windows --dynamic_mode=off
 try-import %workspace%/clang.bazelrc
 try-import %workspace%/user.bazelrc
 try-import %workspace%/local_tsan.bazelrc
+
+try-import %workspace%/../../malkia/top.bazelrc
diff --git a/.bazelversion b/.bazelversion
index dfda3e0b4f..5e3254243a 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.1.0
+6.1.2
diff --git a/contrib/contrib_build_config.bzl b/contrib/contrib_build_config.bzl
index 51294a6d18..0d0b554af0 100644
--- a/contrib/contrib_build_config.bzl
+++ b/contrib/contrib_build_config.bzl
@@ -5,10 +5,10 @@ CONTRIB_EXTENSIONS = {
     #
 
     "envoy.filters.http.dynamo":                                "//contrib/dynamo/filters/http/source:config",
-    "envoy.filters.http.golang":                                "//contrib/golang/filters/http/source:config",
-    "envoy.filters.http.language":                              "//contrib/language/filters/http/source:config_lib",
+#dlfcn    "envoy.filters.http.golang":                                "//contrib/golang/filters/http/source:config",
+#unicode_icu_build    "envoy.filters.http.language":                              "//contrib/language/filters/http/source:config_lib",
     "envoy.filters.http.squash":                                "//contrib/squash/filters/http/source:config",
-    "envoy.filters.http.sxg":                                   "//contrib/sxg/filters/http/source:config",
+#    "envoy.filters.http.sxg":                                   "//contrib/sxg/filters/http/source:config",
 
     #
     # Network filters
@@ -40,7 +40,7 @@ CONTRIB_EXTENSIONS = {
     # Socket interface extensions
     #
 
-    "envoy.bootstrap.vcl":                                      "//contrib/vcl/source:config",
+#    "envoy.bootstrap.vcl":                                      "//contrib/vcl/source:config",
 
     #
     # Input matchers
@@ -52,7 +52,7 @@ CONTRIB_EXTENSIONS = {
     # Connection Balance extensions
     #
 
-    "envoy.network.connection_balance.dlb":                     "//contrib/network/connection_balance/dlb/source:connection_balancer",
+#    "envoy.network.connection_balance.dlb":                     "//contrib/network/connection_balance/dlb/source:connection_balancer",
 
     #
     # Regex engines
@@ -64,7 +64,7 @@ CONTRIB_EXTENSIONS = {
     # Extensions for generic proxy
     #
     "envoy.filters.generic.router":                             "//contrib/generic_proxy/filters/network/source/router:config",
-    "envoy.generic_proxy.codecs.dubbo":                         "//contrib/generic_proxy/filters/network/source/codecs/dubbo:config",
+#    "envoy.generic_proxy.codecs.dubbo":                         "//contrib/generic_proxy/filters/network/source/codecs/dubbo:config",
 
     #
     # xDS delegates
@@ -76,5 +76,5 @@ CONTRIB_EXTENSIONS = {
     # cluster specifier plugin
     #
 
-    "envoy.router.cluster_specifier_plugin.golang":             "//contrib/golang/router/cluster_specifier/source:config",
+#    "envoy.router.cluster_specifier_plugin.golang":             "//contrib/golang/router/cluster_specifier/source:config",
 }
diff --git a/mobile/.bazelversion b/mobile/.bazelversion
deleted file mode 120000
index b332604979..0000000000
--- a/mobile/.bazelversion
+++ /dev/null
@@ -1 +0,0 @@
-../.bazelversion
\ No newline at end of file
diff --git a/mobile/.bazelversion b/mobile/.bazelversion
new file mode 100644
index 0000000000..4caf2682ed
--- /dev/null
+++ b/mobile/.bazelversion
@@ -0,0 +1 @@
+6.0.0rc4
diff --git a/mobile/bazel/platform_mappings b/mobile/bazel/platform_mappings
deleted file mode 120000
index fc29def75b..0000000000
--- a/mobile/bazel/platform_mappings
+++ /dev/null
@@ -1 +0,0 @@
-../../bazel/platform_mappings
\ No newline at end of file
diff --git a/mobile/bazel/platform_mappings b/mobile/bazel/platform_mappings
new file mode 100644
index 0000000000..060231b02b
--- /dev/null
+++ b/mobile/bazel/platform_mappings
@@ -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_platform
+
+  --cpu=ios_arm64
+  --apple_platform_type=ios
+    @envoy//bazel:ios_arm64_platform