Library import 250304-1328

build/conf/autoincludes.json

@@ -1,6 +1,7 @@
 [
     "devtools/ya",
     "library/cpp/geo",
-    "util"
+    "util",
+    "yql/essentials"
 ]
 

build/conf/java.conf

@@ -404,7 +404,7 @@ macro _JAVA_SRCS(RESOURCES?"yes":"no", SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[],
     SET(VAR_SALT $SRCDIR $Globs $EXCLUDE $PACKAGE_PREFIX $RESOURCES $FILES)
     SET(JAR_SRCS_GLOB uniq_${hash:VAR_SALT})
     _LATE_GLOB(${JAR_SRCS_GLOB} ${pre=${SRCDIR}/:Globs} EXCLUDE ${EXCLUDE})
-    SET_APPEND(LINT_JAVA_SOURCES \${rootrel;input;ext=.java:${JAR_SRCS_GLOB}})
+    SET_APPEND(LINT_JAVA_SOURCES \${rootrel;ext=.java;input:${JAR_SRCS_GLOB}})
     SET_APPEND(ALL_JAR_SOURCES --jsources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt --resources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt --srcdir ${quo:SRCDIR} \${input:${JAR_SRCS_GLOB}} ${pre=\$\{input\:\";suf=\"\}:FILES})
     _FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_RESOURCES ${quo:SRCDIR} ${BINDIR}/cls ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt)
     _FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_JSOURCES ${quo:SRCDIR} ${BINDIR}/src ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt)
@@ -503,7 +503,7 @@ macro JAR_ANNOTATION_PROCESSOR(Classes...) {
 
 # tag:java-specific
 macro _JAR_ANN_PROC_OPTS(Classes...) {
-    .CMD=$_JAR_ANN_PROC_OPT_PREFIX ${join=,:Classes} $_USE_ANNOTATION_PROCESSOR_OPT
+    .CMD=$_JAR_ANN_PROC_OPT_PREFIX ${hideempty;join=,:Classes} $_USE_ANNOTATION_PROCESSOR_OPT
 }
 
 # tag:java-specific
@@ -531,7 +531,8 @@ macro _NOOP_MACRO(Args...) {
 # tag:java-specific
 module _JAR_BASE: _BARE_UNIT {
     .NODE_TYPE=Bundle
-    .CMD=TOUCH_UNIT
+    .CMD=$TOUCH_UNIT
+    .STRUCT_CMD=yes
     .PEERDIR_POLICY=as_build_from
     .FINAL_TARGET=no
     .ALIASES=SRCS=_SRCS_NO_GLOBAL
@@ -581,7 +582,7 @@ JAR_RESOURCE_ID=
 SRC_RESOURCE_ID=
 FETCH_SRCS_JAR=
 FETCH_TARGET_JAR=
-FETCH_CONTRIB_JAR=${hide:JAVA_FAKEID} $FETCH_TARGET_JAR $FETCH_SRCS_JAR
+FETCH_CONTRIB_JAR=${hide:JAVA_FAKEID} && $FETCH_TARGET_JAR && $FETCH_SRCS_JAR
 
 # tag:java-specific
 macro JAR_RESOURCE(Id) {
@@ -613,14 +614,14 @@ _JAVA_CONTRIB_SEM= \
 
 # tag:java-specific
 module JAVA_CONTRIB: _JAR_BASE {
-    .CMD=FETCH_CONTRIB_JAR
+    .CMD=$FETCH_CONTRIB_JAR
     .PEERDIR_POLICY=as_include
     .SEM=_JAVA_CONTRIB_SEM
     .FINAL_TARGET=yes
     .GLOBAL=MAVEN_EXPORT_COORDS
 
     when ($JAR_RESOURCE_ID) {
-        FETCH_TARGET_JAR= && $_FETCH_CONTRIB($JAR_RESOURCE_ID ${BINDIR}/${MODULE_PREFIX}${REALPRJNAME}${MODULE_SUFFIX})
+        FETCH_TARGET_JAR= && $_FETCH_CONTRIB($JAR_RESOURCE_ID ${MODULE_PREFIX}${REALPRJNAME}${MODULE_SUFFIX})
     }
     otherwise {
         when ($LOCAL_JAR_PATH) {
@@ -770,14 +771,14 @@ macro _ADD_OPTS_IF_NON_EMPTY(Opt, Args...) {
     .CMD=${pre=$Opt :Args}
 }
 macro _ADD_GEN_POM_FROM_COORD_FILES_ARGS(Deps...) {
-    .CMD=${pre=--deps-coords ;ext=.jar;suf=.mvn_coords:Deps}
+    .CMD=${pre=--deps-coords ;suf=.mvn_coords;ext=.jar:Deps}
 }
 
 MAVEN_BIN=$MAVEN_RESOURCE_GLOBAL/bin/mvn
 
 MAVEN_EXPORT_OUT_DIR_FLAG=$_ADD_OPTS_IF_NON_EMPTY(--output-dir ${MAVEN_EXPORT_OUT_DIR})
 MAVEN_EXPORT_SOURCE_DIRS=$_ADD_OPTS_IF_NON_EMPTY(--source-dirs ${ALL_SRCDIRS})
-MAVEN_EXPORT_DEPS_COORS=$_ADD_GEN_POM_FROM_COORD_FILES_ARGS(${MANAGED_PEERS_CLOSURE})
+MAVEN_EXPORT_DEPS_COORS=$_ADD_GEN_POM_FROM_COORD_FILES_ARGS($MANAGED_PEERS_CLOSURE)
 MAVEN_EXPORT_OUT_DIR=
 
 MAVEN_EXPORT=no
@@ -1010,7 +1011,7 @@ _BUILD_PROTO_JAR_SEM= \
 ### Reimplementation of the JAVA_LIBRARY with ymake.core.conf and ymake based dependency management
 module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
     .EXTS=.jsrc .java .jar .mf .gentar .kt
-    .CMD=LINK_JAR
+    .CMD=$LINK_JAR
     .SEM=_BUILD_JAR_SEM
     .FINAL_TARGET=yes
     .ALIASES=JAVA_SRCS=FULL_JAVA_SRCS ANNOTATION_PROCESSOR=JAR_ANNOTATION_PROCESSOR
@@ -1047,7 +1048,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
             # For Kapt usage see: https://kotlinlang.org/docs/kapt.html#using-in-cli
             # See for kapt.kotlin.generated: https://github.com/JetBrains/kotlin/blob/master/plugins/kapt3/kapt3-cli/testData/integration/kotlinFileGeneration/build.txt
             _KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/1.9.24"} $KT_KAPT_PLUGIN_OPTS
-            _RUN_KAPT=${YMAKE_PYTHON} ${input:"build/scripts/with_kapt_args.py"} ${pre=--ap-classpath :KT_KAPT_AP_CLASSPATH} -- $COMPILE_KT $_KAPT_OPTS
+            _RUN_KAPT=${YMAKE_PYTHON} ${input:"build/scripts/with_kapt_args.py"} --ap-classpath ${KT_KAPT_AP_CLASSPATH} -- $COMPILE_KT $_KAPT_OPTS
             _APPEND_KAPT_GENERATED_SRCS=$YMAKE_PYTHON3 ${input:"build/scripts/resolve_java_srcs.py"} -d $KT_KAPT_SOURCES_DIR --include-patterns '**/*.java' '**/*.kt' --resolve-kotlin --append -s ${BINDIR}/all-java.srclst -k $KT_SRCLIST -r ${BINDIR}/not-used.txt
 
               ALL_KT_COMMANDS+=&& $_RUN_KAPT && $_APPEND_KAPT_GENERATED_SRCS
@@ -1179,7 +1180,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
 # tag:java-specific
 _SCRIPTGEN_FLAGS=
 macro _GEN_JAVA_SCRIPT_IMPL(Out, Template, Props...) {
-    .CMD=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:Out} --template ${input:Template} ${_SCRIPTGEN_FLAGS} -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${join;pre="::";nopath;ext=.jar:MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${MODDIR} -D JAR_BASENAME=${REALPRJNAME}  -D MAIN_CLASS=${_JAR_MAIN_CLASS} -D ENABLE_PREVIEW_VALUE=${ENABLE_PREVIEW_VALUE} $Props
+    .CMD=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:Out} --template ${input:Template} ${_SCRIPTGEN_FLAGS} -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${join=;pre=\:\:;nopath;ext=.jar:MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${MODDIR} -D JAR_BASENAME=${REALPRJNAME}  -D MAIN_CLASS=${_JAR_MAIN_CLASS} -D ENABLE_PREVIEW_VALUE=${ENABLE_PREVIEW_VALUE} $Props
 }
 
 # tag:java-specific
@@ -1202,12 +1203,17 @@ when ($HOST_OS_WINDOWS == "yes") {
 GEN_JAVA_RUN_SH=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:_GEN_JAVA_RUN_SH_OUTPUT} \
     -D GENERATE_DEFAULT_RUNNER=yes \
     -D JAR_NAME=${REALPRJNAME}.jar \
-    -D CLASSPATH=${join;pre="::";nopath:MANAGED_PEERS_CLOSURE} \
+    -D CLASSPATH=${join=;pre=\:\:;nopath:MANAGED_PEERS_CLOSURE} \
     -D PROJECT_DIR=${REALPRJNAME} \
     -D JAR_BASENAME=${REALPRJNAME} \
     -D MAIN_CLASS=${_JAR_MAIN_CLASS} \
     -D ENABLE_PREVIEW=${ENABLE_PREVIEW_VALUE}
 GEN_RUN_CP=${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${qe;pre=$REALPRJNAME/;nopath:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET}
+COLLECT_JAR_PROGRAM_CP__LATEOUT__=\
+    ${pre=$BINDIR/$REALPRJNAME/;nopath;ext=.jar:MANAGED_PEERS_CLOSURE} \
+    ${pre=$BINDIR/$REALPRJNAME/;nopath;ext=.so:MANAGED_PEERS_CLOSURE} \
+    ${pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dll:MANAGED_PEERS_CLOSURE} \
+    ${pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dylib:MANAGED_PEERS_CLOSURE}
 COLLECT_JAR_PROGRAM_CP=$FS_TOOLS link_or_copy_to_dir \
     --ya-start-command-file \
     ${ext=.jar:MANAGED_PEERS_CLOSURE} \
@@ -1217,10 +1223,7 @@ COLLECT_JAR_PROGRAM_CP=$FS_TOOLS link_or_copy_to_dir \
     ${_SOURCE_JARS} \
     --ya-end-command-file \
     ${BINDIR}/${REALPRJNAME} \
-    ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.jar:MANAGED_PEERS_CLOSURE} \
-    ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.so:MANAGED_PEERS_CLOSURE} \
-    ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dll:MANAGED_PEERS_CLOSURE} \
-    ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dylib:MANAGED_PEERS_CLOSURE}
+    ${hide;late_out:COLLECT_JAR_PROGRAM_CP__LATEOUT__}
 MAKE_JAR_PROGRAM_CPLST=${MAKE_JAVA_CLASSPATH_FILE} --from-args ${output;pre=$MODULE_PREFIX;suf=${MODULE_SUFFIX}.cplst:REALPRJNAME} --ya-start-command-file ${rootrel;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.jar:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS_CPLIST} --ya-end-command-file
 TAR_CLASSPATH= && $YMAKE_PYTHON ${input:"build/scripts/find_and_tar.py"} ${output;pre=$MODULE_PREFIX;suf=.tar:REALPRJNAME} ${cwd;pre=$BINDIR/:REALPRJNAME}
 DO_TAR_CLASSPATH=
@@ -1258,7 +1261,7 @@ macro _MARK_JAVA_PROG_WITH_SOURCES(Args...) {
 # tag:java-specific
 module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
     .FINAL_TARGET=yes
-    .CMD=LINK_JAR_PROGRAM
+    .CMD=$LINK_JAR_PROGRAM
     .SEM=_SEM_IGNORED
     .ALIASES=JAVA_SRCS=_MARK_JAVA_PROG_WITH_SOURCES
     .ALLOWED=WITH_JDK GENERATE_SCRIPT
@@ -1299,7 +1302,7 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
 LINK_JAR_TEST=${hide:JAVA_FAKEID} ${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} ${hide;kv:"p JT"}
 module _JAR_TEST: _COMPILABLE_JAR_BASE {
     .FINAL_TARGET=yes
-    .CMD=LINK_JAR_TEST
+    .CMD=$LINK_JAR_TEST
     .DEFAULT_NAME_GENERATOR=FullPath
     CONSUME_NON_MANAGEABLE_PEERS=yes
 

build/conf/proto.conf

@@ -508,7 +508,7 @@ otherwise {
 KOTLIN_PROTO_FLAGS=
 # tag:proto tag:java-specific
 macro _JAVA_PROTO_CMD(File) {
-    .CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON ${input:"build/scripts/tared_protoc.py"} --tar-output ${output;norel;nopath;noext;suf=.jsrc:File} --protoc-out-dir $ARCADIA_BUILD_ROOT/java_out $JAVA_PROTOC -I=./$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_ROOT --java_out=${_JAVA_PROTO_LITE_ARG}$ARCADIA_BUILD_ROOT/java_out ${KOTLIN_PROTO_FLAGS} $_PROTOC_FLAGS ${input;rootrel:File} ${hide;kv:"p PB"} ${hide;kv:"pc yellow"} $JAVA_PROTO_ARGS ${hide:PROTO_FAKEID}
+    .CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON ${input:"build/scripts/tared_protoc.py"} --tar-output ${output;norel;nopath;noext;suf=.jsrc:File} --protoc-out-dir $ARCADIA_BUILD_ROOT/java_out $JAVA_PROTOC -I=./$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_ROOT --java_out=${_JAVA_PROTO_LITE_ARG}$ARCADIA_BUILD_ROOT/java_out ${KOTLIN_PROTO_FLAGS} $_PROTOC_FLAGS ${input;rootrel:File} ${hide;kv:"p PB"} ${hide;kv:"pc yellow"} $JAVA_PROTO_ARGS ${hide:PROTO_FAKEID} ${hide:"UID_BANHAMMER"}
     .SEM=proto_files ${input;rootrel:File} ${hide;output:File.jsrc}
 }
 

build/export_generators/cmake/conanfile.py.jinja

@@ -33,11 +33,13 @@ class App(ConanFile):
 {%-     endif -%}
 
 {%-     if (has_conan_os_depends_requires) -%}
-{%-         for conan_os_depend in conan.os_depends|selectattr('requires') %}
-{%-             if (conan_os_depend.requires|length) %}
-        if self.settings.os == "{{ conan_os_depend.os }}":
-{%-                 for conan_require in conan_os_depend.requires %}
-            self.requires("{{ conan_require }}")
+{%-         set oses = conan.os_depends|selectattr('os')|map(attribute='os')|unique -%}
+{%-         for os in oses %}
+{%-             set os_requires = conan.os_depends|selectattr('os', 'eq', os)|selectattr('requires')|map(attribute='requires')|sum|unique -%}
+{%-             if (os_requires|length) %}
+        if self.settings.os == "{{ os }}":
+{%-                 for os_require in os_requires %}
+            self.requires("{{ os_require }}")
 {%-                 endfor -%}
 {%-             endif -%}
 {%-         endfor -%}
@@ -55,11 +57,13 @@ class App(ConanFile):
 {%-     endif -%}
 
 {%-     if (has_conan_os_depends_tool_requires) -%}
-{%-         for conan_os_depend in conan.os_depends|selectattr('tool_requires') %}
-{%-             if (conan_os_depend.tool_requires|length) %}
-        if self.settings.os == "{{ conan_os_depend.os }}":
-{%-                 for conan_tool_require in conan_os_depend.tool_requires %}
-            self.tool_requires("{{ conan_tool_require }}")
+{%-         set oses = conan.os_depends|selectattr('os')|map(attribute='os')|unique -%}
+{%-         for os in oses %}
+{%-             set os_tool_requires = conan.os_depends|selectattr('os', 'eq', os)|selectattr('tool_requires')|map(attribute='tool_requires')|sum|unique -%}
+{%-             if (os_tool_requires|length) %}
+        if self.settings.os == "{{ os }}":
+{%-                 for os_tool_require in os_tool_requires %}
+            self.requires("{{ os_tool_require }}")
 {%-                 endfor -%}
 {%-             endif -%}
 {%-         endfor -%}

build/external_resources/ymake/public.resources.json

@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:8103757184"
+            "uri": "sbr:8157966268"
         },
         "darwin-arm64": {
-            "uri": "sbr:8103755745"
+            "uri": "sbr:8157965432"
         },
         "linux": {
-            "uri": "sbr:8103760334"
+            "uri": "sbr:8157967911"
         },
         "linux-aarch64": {
-            "uri": "sbr:8103754551"
+            "uri": "sbr:8157964700"
         },
         "win32-clang-cl": {
-            "uri": "sbr:8103758621"
+            "uri": "sbr:8157967266"
         }
     }
 }

build/external_resources/ymake/resources.json

@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:8103761804"
+            "uri": "sbr:8157959616"
         },
         "darwin-arm64": {
-            "uri": "sbr:8103760168"
+            "uri": "sbr:8157958728"
         },
         "linux": {
-            "uri": "sbr:8103765600"
+            "uri": "sbr:8157961256"
         },
         "linux-aarch64": {
-            "uri": "sbr:8103758578"
+            "uri": "sbr:8157958024"
         },
         "win32-clang-cl": {
-            "uri": "sbr:8103763594"
+            "uri": "sbr:8157960421"
         }
     }
 }

build/mapping.conf.json

@@ -509,6 +509,7 @@
         "8029671029": "{registry_endpoint}/8029671029",
         "8067063302": "{registry_endpoint}/8067063302",
         "8119415565": "{registry_endpoint}/8119415565",
+        "8161441586": "{registry_endpoint}/8161441586",
         "5486731632": "{registry_endpoint}/5486731632",
         "5514350352": "{registry_endpoint}/5514350352",
         "5514360398": "{registry_endpoint}/5514360398",
@@ -701,6 +702,7 @@
         "8000013577": "{registry_endpoint}/8000013577",
         "8069587979": "{registry_endpoint}/8069587979",
         "8103757184": "{registry_endpoint}/8103757184",
+        "8157966268": "{registry_endpoint}/8157966268",
         "5766171800": "{registry_endpoint}/5766171800",
         "5805430761": "{registry_endpoint}/5805430761",
         "5829025456": "{registry_endpoint}/5829025456",
@@ -768,6 +770,7 @@
         "8000012780": "{registry_endpoint}/8000012780",
         "8069587058": "{registry_endpoint}/8069587058",
         "8103755745": "{registry_endpoint}/8103755745",
+        "8157965432": "{registry_endpoint}/8157965432",
         "5766173070": "{registry_endpoint}/5766173070",
         "5805432830": "{registry_endpoint}/5805432830",
         "5829031598": "{registry_endpoint}/5829031598",
@@ -835,6 +838,7 @@
         "8000014871": "{registry_endpoint}/8000014871",
         "8069590186": "{registry_endpoint}/8069590186",
         "8103760334": "{registry_endpoint}/8103760334",
+        "8157967911": "{registry_endpoint}/8157967911",
         "5766171341": "{registry_endpoint}/5766171341",
         "5805430188": "{registry_endpoint}/5805430188",
         "5829023352": "{registry_endpoint}/5829023352",
@@ -902,6 +906,7 @@
         "8000012216": "{registry_endpoint}/8000012216",
         "8069586009": "{registry_endpoint}/8069586009",
         "8103754551": "{registry_endpoint}/8103754551",
+        "8157964700": "{registry_endpoint}/8157964700",
         "5766172695": "{registry_endpoint}/5766172695",
         "5805432230": "{registry_endpoint}/5805432230",
         "5829029743": "{registry_endpoint}/5829029743",
@@ -969,6 +974,7 @@
         "8000014239": "{registry_endpoint}/8000014239",
         "8069588665": "{registry_endpoint}/8069588665",
         "8103758621": "{registry_endpoint}/8103758621",
+        "8157967266": "{registry_endpoint}/8157967266",
         "4307890075": "{registry_endpoint}/4307890075",
         "5517245192": "{registry_endpoint}/5517245192",
         "4307901240": "{registry_endpoint}/4307901240",
@@ -1763,6 +1769,7 @@
         "8029671029": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "8067063302": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "8119415565": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "8161441586": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -1955,6 +1962,7 @@
         "8000013577": "devtools/ymake/bin/ymake for darwin",
         "8069587979": "devtools/ymake/bin/ymake for darwin",
         "8103757184": "devtools/ymake/bin/ymake for darwin",
+        "8157966268": "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",
@@ -2022,6 +2030,7 @@
         "8000012780": "devtools/ymake/bin/ymake for darwin-arm64",
         "8069587058": "devtools/ymake/bin/ymake for darwin-arm64",
         "8103755745": "devtools/ymake/bin/ymake for darwin-arm64",
+        "8157965432": "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",
@@ -2089,6 +2098,7 @@
         "8000014871": "devtools/ymake/bin/ymake for linux",
         "8069590186": "devtools/ymake/bin/ymake for linux",
         "8103760334": "devtools/ymake/bin/ymake for linux",
+        "8157967911": "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",
@@ -2156,6 +2166,7 @@
         "8000012216": "devtools/ymake/bin/ymake for linux-aarch64",
         "8069586009": "devtools/ymake/bin/ymake for linux-aarch64",
         "8103754551": "devtools/ymake/bin/ymake for linux-aarch64",
+        "8157964700": "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",
@@ -2223,6 +2234,7 @@
         "8000014239": "devtools/ymake/bin/ymake for win32-clang-cl",
         "8069588665": "devtools/ymake/bin/ymake for win32-clang-cl",
         "8103758621": "devtools/ymake/bin/ymake for win32-clang-cl",
+        "8157967266": "devtools/ymake/bin/ymake for win32-clang-cl",
         "4307890075": "flake8_linter for linux",
         "5517245192": "flake8_linter for linux",
         "4307901240": "flake8_linter for linux-aarch64",

build/platform/test_tool/host.ya.make.inc

@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8119446934)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161442120)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8119444678)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161441534)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8119452256)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161443391)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8119442724)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161440859)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8119449312)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161442654)
 
 ENDIF()