Merge branch 'rightlib' into mergelibs-240903-1104

17 files changed, 56 insertions, 80 deletions

diff --git a/build/conf/java.conf b/build/conf/java.conf
index 762eb5de4a..8c39aed61d 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -1229,9 +1229,6 @@ elsewhen ($JDK_VERSION == "20") {
 elsewhen ($JDK_VERSION == "17") {
     JDK_REAL_VERSION=17
 }
-elsewhen ($JDK_VERSION == "15") {
-    JDK_REAL_VERSION=15
-}
 elsewhen ($JDK_VERSION == "11") {
     JDK_REAL_VERSION=11
 }
@@ -1261,9 +1258,6 @@ otherwise {
         # need jdk11 for spare parts in "host" platform
         JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
     }
-    when ($JDK_REAL_VERSION == "15") {
-        JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk17
-    }
     when ($JDK_REAL_VERSION == "11") {
         JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17
     }
@@ -1282,9 +1276,6 @@ when ($JDK_REAL_VERSION == "20") {
 when ($JDK_REAL_VERSION == "17") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
 }
-when ($JDK_REAL_VERSION == "15") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar15
-}
 when ($JDK_REAL_VERSION == "11") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
 }
@@ -1307,9 +1298,6 @@ otherwise {
     when ($JDK_REAL_VERSION == "17") {
         JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
     }
-    when ($JDK_REAL_VERSION == "15") {
-        JDK_RESOURCE=$JDK15_RESOURCE_GLOBAL
-    }
     when ($JDK_REAL_VERSION == "11") {
         JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
     }
@@ -1318,7 +1306,7 @@ otherwise {
 # tag:java-specific
 when (!$USE_SYSTEM_ERROR_PRONE) {
     # Still not done: DTCC-667
-    when ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
+    when ($JDK_REAL_VERSION == "11") {
         ERROR_PRONE_VERSION=2.7.1
         ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.7.1
         ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_7_1_RESOURCE_GLOBAL
@@ -1372,9 +1360,6 @@ otherwise {
     when ($JDK_REAL_VERSION == "17") {
         UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
     }
-    when ($JDK_REAL_VERSION == "15") {
-        UBERJAR_RESOURCE=$UBERJAR15_RESOURCE_GLOBAL
-    }
     when ($JDK_REAL_VERSION == "11") {
         UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
     }
@@ -1393,9 +1378,6 @@ when ($JDK_REAL_VERSION == "20") {
 when ($JDK_REAL_VERSION == "17") {
     WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
 }
-when ($JDK_REAL_VERSION == "15") {
-    WITH_JDK_RESOURCE=$WITH_JDK15_RESOURCE_GLOBAL
-}
 when ($JDK_REAL_VERSION == "11") {
     WITH_JDK_RESOURCE=$WITH_JDK11_RESOURCE_GLOBAL
 }
@@ -1745,7 +1727,6 @@ macro ADD_DLLS_TO_JAR() {
 # tag:java-specific
 MANAGED_PEERS=
 MANAGED_PEERS_CLOSURE=
-RUN_JAVA_PROGRAM_MANAGED=
 MANAGEABLE_PEERS_ROOTS=contrib/java
 HAS_MANAGEABLE_PEERS=no
 PROPAGATES_MANAGEABLE_PEERS=no
diff --git a/build/conf/licenses.json b/build/conf/licenses.json
index 182bcef239..abfed06c8d 100644
--- a/build/conf/licenses.json
+++ b/build/conf/licenses.json
@@ -365,7 +365,6 @@
         "default": [
             "Service-Default-License",
             "Service-Dll-Harness",
-            "Service-Prebuilt-Tool",
             "Service-Py23-Proxy",
             "Service-Unknown-License-Java"
         ]
diff --git a/build/config/tests/cpp_style/config.clang-format b/build/config/tests/cpp_style/config.clang-format
index b31758e14c..9b762202f5 100644
--- a/build/config/tests/cpp_style/config.clang-format
+++ b/build/config/tests/cpp_style/config.clang-format
@@ -84,7 +84,7 @@ SortIncludes: false
 IndentPPDirectives: BeforeHash
 
 SpaceBeforeInheritanceColon: false
-NamespaceMacros: [Y_UNIT_TEST_SUITE, Y_UNIT_TEST]
+NamespaceMacros: [Y_UNIT_TEST_SUITE]
 AttributeMacros: [Y_PRINTF_FORMAT, Y_NO_SANITIZE, Y_FORCE_INLINE, Y_NO_INLINE, Y_WARN_UNUSED_RESULT, Y_HIDDEN, Y_PUBLIC, Y_PURE_FUNCTION]
 IndentExternBlock: Indent
 TypenameMacros: [Y_THREAD, Y_STATIC_THREAD, Y_POD_THREAD, Y_POD_STATIC_THREAD]
diff --git a/build/external_resources/ymake/public.resources.json b/build/external_resources/ymake/public.resources.json
index 4620950c30..8a80afe094 100644
--- a/build/external_resources/ymake/public.resources.json
+++ b/build/external_resources/ymake/public.resources.json
@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:6959220365"
+            "uri": "sbr:6976467840"
         },
         "darwin-arm64": {
-            "uri": "sbr:6959217204"
+            "uri": "sbr:6976467045"
         },
         "linux": {
-            "uri": "sbr:6959225691"
+            "uri": "sbr:6976469309"
         },
         "linux-aarch64": {
-            "uri": "sbr:6959214449"
+            "uri": "sbr:6976466498"
         },
         "win32-clang-cl": {
-            "uri": "sbr:6959223374"
+            "uri": "sbr:6976468552"
         }
     }
 }
diff --git a/build/external_resources/ymake/resources.json b/build/external_resources/ymake/resources.json
index f0d2712d39..c84e945018 100644
--- a/build/external_resources/ymake/resources.json
+++ b/build/external_resources/ymake/resources.json
@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:6959209660"
+            "uri": "sbr:6976470248"
         },
         "darwin-arm64": {
-            "uri": "sbr:6959207343"
+            "uri": "sbr:6976469418"
         },
         "linux": {
-            "uri": "sbr:6960956636"
+            "uri": "sbr:6976471430"
         },
         "linux-aarch64": {
-            "uri": "sbr:6959205082"
+            "uri": "sbr:6976468560"
         },
         "win32-clang-cl": {
-            "uri": "sbr:6959211457"
+            "uri": "sbr:6976470807"
         }
     }
 }
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 1c71408dff..72ffad598e 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -525,6 +525,7 @@
         "6888066924": "https://devtools-registry.s3.yandex.net/6888066924",
         "6937600791": "https://devtools-registry.s3.yandex.net/6937600791",
         "6959220365": "https://devtools-registry.s3.yandex.net/6959220365",
+        "6976467840": "https://devtools-registry.s3.yandex.net/6976467840",
         "5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
         "5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
         "5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -559,6 +560,7 @@
         "6888066560": "https://devtools-registry.s3.yandex.net/6888066560",
         "6937600701": "https://devtools-registry.s3.yandex.net/6937600701",
         "6959217204": "https://devtools-registry.s3.yandex.net/6959217204",
+        "6976467045": "https://devtools-registry.s3.yandex.net/6976467045",
         "5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
         "5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
         "5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -593,6 +595,7 @@
         "6888067594": "https://devtools-registry.s3.yandex.net/6888067594",
         "6937601032": "https://devtools-registry.s3.yandex.net/6937601032",
         "6959225691": "https://devtools-registry.s3.yandex.net/6959225691",
+        "6976469309": "https://devtools-registry.s3.yandex.net/6976469309",
         "5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
         "5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
         "5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -627,6 +630,7 @@
         "6888066108": "https://devtools-registry.s3.yandex.net/6888066108",
         "6937600548": "https://devtools-registry.s3.yandex.net/6937600548",
         "6959214449": "https://devtools-registry.s3.yandex.net/6959214449",
+        "6976466498": "https://devtools-registry.s3.yandex.net/6976466498",
         "5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
         "5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
         "5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -661,6 +665,7 @@
         "6888067214": "https://devtools-registry.s3.yandex.net/6888067214",
         "6937600896": "https://devtools-registry.s3.yandex.net/6937600896",
         "6959223374": "https://devtools-registry.s3.yandex.net/6959223374",
+        "6976468552": "https://devtools-registry.s3.yandex.net/6976468552",
         "4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
         "5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
         "4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -734,6 +739,9 @@
         "6956610092": "https://devtools-registry.s3.yandex.net/6956610092",
         "6957903888": "https://devtools-registry.s3.yandex.net/6957903888",
         "6391354461": "https://devtools-registry.s3.yandex.net/6391354461",
+        "6990868751": "https://devtools-registry.s3.yandex.net/6990868751",
+        "6990860705": "https://devtools-registry.s3.yandex.net/6990860705",
+        "6990881789": "https://devtools-registry.s3.yandex.net/6990881789",
         "3167009386": "https://devtools-registry.s3.yandex.net/3167009386",
         "3050798466": "https://devtools-registry.s3.yandex.net/3050798466",
         "3064614561": "https://devtools-registry.s3.yandex.net/3064614561",
@@ -1352,6 +1360,7 @@
         "6888066924": "devtools/ymake/bin/ymake for darwin",
         "6937600791": "devtools/ymake/bin/ymake for darwin",
         "6959220365": "devtools/ymake/bin/ymake for darwin",
+        "6976467840": "devtools/ymake/bin/ymake for darwin",
         "5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
         "5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
         "5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -1386,6 +1395,7 @@
         "6888066560": "devtools/ymake/bin/ymake for darwin-arm64",
         "6937600701": "devtools/ymake/bin/ymake for darwin-arm64",
         "6959217204": "devtools/ymake/bin/ymake for darwin-arm64",
+        "6976467045": "devtools/ymake/bin/ymake for darwin-arm64",
         "5766173070": "devtools/ymake/bin/ymake for linux",
         "5805432830": "devtools/ymake/bin/ymake for linux",
         "5829031598": "devtools/ymake/bin/ymake for linux",
@@ -1420,6 +1430,7 @@
         "6888067594": "devtools/ymake/bin/ymake for linux",
         "6937601032": "devtools/ymake/bin/ymake for linux",
         "6959225691": "devtools/ymake/bin/ymake for linux",
+        "6976469309": "devtools/ymake/bin/ymake for linux",
         "5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
         "5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
         "5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -1454,6 +1465,7 @@
         "6888066108": "devtools/ymake/bin/ymake for linux-aarch64",
         "6937600548": "devtools/ymake/bin/ymake for linux-aarch64",
         "6959214449": "devtools/ymake/bin/ymake for linux-aarch64",
+        "6976466498": "devtools/ymake/bin/ymake for linux-aarch64",
         "5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
         "5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
         "5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -1488,6 +1500,7 @@
         "6888067214": "devtools/ymake/bin/ymake for win32-clang-cl",
         "6937600896": "devtools/ymake/bin/ymake for win32-clang-cl",
         "6959223374": "devtools/ymake/bin/ymake for win32-clang-cl",
+        "6976468552": "devtools/ymake/bin/ymake for win32-clang-cl",
         "4307890075": "flake8_linter for linux",
         "5517245192": "flake8_linter for linux",
         "4307901240": "flake8_linter for linux-aarch64",
@@ -1561,6 +1574,9 @@
         "6956610092": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "6957903888": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "6391354461": "none-none-none-result_resources/protoc-linux-x86_64.tgz",
+        "6990868751": "none-none-none-sandbox/backup/3527d100-e2d0-4b0e-bb7a-905010853d98/yfm-docs.tar",
+        "6990860705": "none-none-none-sandbox/backup/d386643e-58f8-43e1-8760-341d73801df8/yfm-docs.tar",
+        "6990881789": "none-none-none-sandbox/backup/efc428e5-52a5-4a6f-8f0c-53f1d255efea/yfm-docs.tar",
         "3167009386": "openjdk 11.0.15 vanilla for darwin",
         "3050798466": "openjdk 11.0.15 vanilla for darwin-arm64",
         "3064614561": "openjdk 11.0.15 vanilla for linux",
diff --git a/build/platform/java/jdk/jdk15/jdk.json b/build/platform/java/jdk/jdk15/jdk.json
deleted file mode 100644
index 5d2bc7ae0a..0000000000
--- a/build/platform/java/jdk/jdk15/jdk.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "by_platform": {
-        "darwin-arm64": {
-            "uri": "sbr:2107376046"
-        },
-        "darwin-x86_64": {
-            "uri": "sbr:1901471162"
-        },
-        "linux-x86_64": {
-            "uri": "sbr:1901452000"
-        },
-        "win32-x86_64": {
-            "uri": "sbr:1901563630"
-        }
-    }
-}
-
diff --git a/build/platform/java/jdk/jdk15/ya.make b/build/platform/java/jdk/jdk15/ya.make
deleted file mode 100644
index cad2f09f35..0000000000
--- a/build/platform/java/jdk/jdk15/ya.make
+++ /dev/null
@@ -1,10 +0,0 @@
-RESOURCES_LIBRARY()
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK15 jdk.json)
-SET_RESOURCE_URI_FROM_JSON(WITH_JDK15_URI jdk.json)
-
-IF (WITH_JDK15_URI)
-    DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${WITH_JDK15_URI})
-ENDIF()
-
-END()
diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make
index b696766faf..983dfbba15 100644
--- a/build/platform/java/jdk/ya.make
+++ b/build/platform/java/jdk/ya.make
@@ -15,9 +15,6 @@ ELSEIF(JDK_REAL_VERSION == "20")
 ELSEIF(JDK_REAL_VERSION == "17")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk17/jdk.json)
     SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk17/jdk.json)
-ELSEIF(JDK_REAL_VERSION == "15")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk15/jdk.json)
-    SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk15/jdk.json)
 ELSEIF(JDK_REAL_VERSION == "11")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk11/jdk.json)
     SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk11/jdk.json)
@@ -33,7 +30,6 @@ END()
 
 RECURSE(
     jdk11
-    jdk15
     jdk17
     jdk20
     jdk21
diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make
index 670dd4e4cd..7ea02fc2ec 100644
--- a/build/platform/lld/ya.make
+++ b/build/platform/lld/ya.make
@@ -1,9 +1,10 @@
 RESOURCES_LIBRARY()
 
-LICENSE(Service-Prebuilt-Tool)
-
 DEFAULT(LLD_VERSION ${CLANG_VER})
 
+TOOLCHAIN(lld)
+VERSION(${LLD_VERSION})
+
 IF (LLD_VERSION == 14)
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(LLD_ROOT lld14.json)
 ELSE()
diff --git a/build/platform/yfm/ya.make b/build/platform/yfm/ya.make
index 0d6635dbc8..a348bb1f1e 100644
--- a/build/platform/yfm/ya.make
+++ b/build/platform/yfm/ya.make
@@ -6,10 +6,10 @@ ENDIF()
 
 DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
     YFM_TOOL
-    sbr:6662972834 FOR DARWIN-ARM64
-    sbr:6662972834 FOR DARWIN
-    sbr:6662965433 FOR LINUX
-    sbr:6662980150 FOR WIN32
+    sbr:6990868751 FOR DARWIN-ARM64
+    sbr:6990868751 FOR DARWIN
+    sbr:6990860705 FOR LINUX
+    sbr:6990881789 FOR WIN32
 )
 
 END()
diff --git a/build/plugins/_dart_fields.py b/build/plugins/_dart_fields.py
index 3fe696d675..4676499399 100644
--- a/build/plugins/_dart_fields.py
+++ b/build/plugins/_dart_fields.py
@@ -993,7 +993,6 @@ class TestFiles:
     @classmethod
     def test_srcs(cls, unit, flat_args, spec_args):
         test_files = get_values_list(unit, 'TEST_SRCS_VALUE')
-        test_files = _resolve_module_files(unit, unit.get("MODDIR"), test_files)
         return {cls.KEY: serialize_list(test_files)}
 
     @classmethod
diff --git a/build/plugins/java.py b/build/plugins/java.py
index 571de73260..c0771722ec 100644
--- a/build/plugins/java.py
+++ b/build/plugins/java.py
@@ -75,7 +75,7 @@ def onjava_module(unit, *args):
         'ANNOTATION_PROCESSOR': extract_macro_calls(unit, 'ANNOTATION_PROCESSOR_VALUE', args_delim),
         'EXTERNAL_JAR': extract_macro_calls(unit, 'EXTERNAL_JAR_VALUE', args_delim),
         'RUN_JAVA_PROGRAM': [],
-        'RUN_JAVA_PROGRAM_MANAGED': '${RUN_JAVA_PROGRAM_MANAGED}',
+        'RUN_JAVA_PROGRAM_MANAGED': '',
         'MAVEN_GROUP_ID': extract_macro_calls(unit, 'MAVEN_GROUP_ID_VALUE', args_delim),
         'JAR_INCLUDE_FILTER': extract_macro_calls(unit, 'JAR_INCLUDE_FILTER_VALUE', args_delim),
         'JAR_EXCLUDE_FILTER': extract_macro_calls(unit, 'JAR_EXCLUDE_FILTER_VALUE', args_delim),
@@ -100,7 +100,6 @@ def onjava_module(unit, *args):
         'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT'),
     }
     if unit.get('ENABLE_PREVIEW_VALUE') == 'yes' and (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION')) in (
-        '15',
         '17',
         '20',
         '21',
@@ -372,7 +371,6 @@ def on_jdk_version_macro_check(unit, *args):
     jdk_version = args[0]
     available_versions = (
         '11',
-        '15',
         '17',
         '20',
         '21',
diff --git a/build/plugins/lib/nots/package_manager/base/lockfile.py b/build/plugins/lib/nots/package_manager/base/lockfile.py
index 0dcccb40ef..5ff0cbf449 100644
--- a/build/plugins/lib/nots/package_manager/base/lockfile.py
+++ b/build/plugins/lib/nots/package_manager/base/lockfile.py
@@ -4,6 +4,17 @@ from abc import ABCMeta, abstractmethod
 from six import add_metaclass
 
 
+class LockfilePackageMetaInvalidError(RuntimeError):
+    pass
+
+
+def is_tarball_url_valid(tarball_url):
+    if not tarball_url.startswith("https://") and not tarball_url.startswith("http://"):
+        return True
+
+    return tarball_url.startswith("https://npm.yandex-team.ru/") or tarball_url.startswith("http://npm.yandex-team.ru/")
+
+
 class LockfilePackageMeta(object):
     """
     Basic struct representing package meta from lockfile.
@@ -16,6 +27,11 @@ class LockfilePackageMeta(object):
         return LockfilePackageMeta(*s.strip().split(" "))
 
     def __init__(self, key, tarball_url, sky_id, integrity, integrity_algorithm):
+        if not is_tarball_url_valid(tarball_url):
+            raise LockfilePackageMetaInvalidError(
+                "tarball can only point to npm.yandex-team.ru, got {}".format(tarball_url)
+            )
+
         # http://npm.yandex-team.ru/@scope%2fname/-/name-0.0.1.tgz
         parts = tarball_url.split("/")
 
@@ -37,10 +53,6 @@ class LockfilePackageMeta(object):
         return pkg_uri
 
 
-class LockfilePackageMetaInvalidError(RuntimeError):
-    pass
-
-
 @add_metaclass(ABCMeta)
 class BaseLockfile(object):
     @classmethod
diff --git a/build/scripts/compile_cuda.py b/build/scripts/compile_cuda.py
index cd37a95c60..9660300069 100644
--- a/build/scripts/compile_cuda.py
+++ b/build/scripts/compile_cuda.py
@@ -82,6 +82,7 @@ def main():
         '-flto',
         '-faligned-allocation',
         '-fsized-deallocation',
+        '-fexperimental-library',
         # While it might be reasonable to compile host part of .cu sources with these optimizations enabled,
         # nvcc passes these options down towards cicc which lacks x86_64 extensions support.
         '-msse2',
@@ -95,7 +96,7 @@ def main():
         skip_list.append('-nostdinc++')
 
     for flag in skip_list:
-        if flag in cflags:
+        while flag in cflags:
             cflags.remove(flag)
 
     skip_prefix_list = [
diff --git a/build/scripts/cpp_proto_wrapper.py b/build/scripts/cpp_proto_wrapper.py
index a70ba21e57..c29ca53a1d 100644
--- a/build/scripts/cpp_proto_wrapper.py
+++ b/build/scripts/cpp_proto_wrapper.py
@@ -25,7 +25,7 @@ def main(namespace: argparse.Namespace) -> int:
         subprocess.check_output(namespace.subcommand, stdin=None, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as e:
         sys.stderr.write(
-            '{} returned non-zero exit code {}.\n{}\n'.format(' '.join(e.cmd), e.returncode, e.output.decode('utf-8'))
+            '{} returned non-zero exit code {}.\n{}\n'.format(' '.join(e.cmd), e.returncode, e.output.decode('utf-8', errors='ignore'))
         )
         return e.returncode
 
diff --git a/build/scripts/go_proto_wrapper.py b/build/scripts/go_proto_wrapper.py
index 1973d6e381..8f2a6130e0 100644
--- a/build/scripts/go_proto_wrapper.py
+++ b/build/scripts/go_proto_wrapper.py
@@ -67,7 +67,7 @@ def main(args):
         subprocess.check_output(args, stdin=None, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as e:
         sys.stderr.write(
-            '{} returned non-zero exit code {}.\n{}\n'.format(' '.join(e.cmd), e.returncode, e.output.decode('utf-8'))
+            '{} returned non-zero exit code {}.\n{}\n'.format(' '.join(e.cmd), e.returncode, e.output.decode('utf-8', errors='ignore'))
         )
         return e.returncode