Merge pull request #18043 from ydb-platform/merge-libs-250506-0050

Author: alexv-smirnov

build/conf/java.conf

@@ -1034,6 +1034,7 @@ _BUILD_PROTO_JAR_SEM= \
     && consumer-classpath $EXPORT_GRADLE_CLASSPATH \
     && consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
     && consumer-type library \
+    ${pre=&& consumer-proto_namespace :PROTO_NAMESPACE} \
     $_JAVAC_SEM \
     $_KOTLINC_SEM \
     $_ANN_PROCESSORS_SEM \

build/conf/ts/ts.conf

@@ -1,5 +1,6 @@
 NODEJS_ROOT=
 NODEJS_BIN=$NODEJS_ROOT/node
+NODEJS_COPY_CMD=$COPY_CMD $NODEJS_BIN ${output:"node"}
 
 _TS_REQUIRED_MISSING=~~required~~
 TS_TRACE=no

build/conf/ts/ts_test.conf

@@ -6,10 +6,13 @@ TS_TEST_NM=
 
 _TS_TEST_DEPENDS_ON_BUILD=
 
+_TS_TEST_COPY_NODEJS_CMD=
+
 # We have to rename node_modules.tar to workspace_node_modules.tar,
 # so TS_TEST_JEST module has it's own unique output.
 # TS_TEST_JEST_FOR module has to output all files required for test run.
 TS_TEST_JEST_CMD=$TOUCH_UNIT \
+    && $_TS_TEST_COPY_NODEJS_CMD \
     && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS --nm-bundle yes create-node-modules \
     --moddir $TS_TEST_FOR_PATH \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
@@ -253,6 +256,13 @@ macro TS_TEST_DEPENDS_ON_BUILD() {
     ENABLE(_TS_TEST_DEPENDS_ON_BUILD)
 }
 
+### @usage: TS_TEST_INCLUDE_NODEJS()
+###
+### Macro adds NodeJS binary to the test module build output.
+macro TS_TEST_INCLUDE_NODEJS() {
+    SET(_TS_TEST_COPY_NODEJS_CMD \$NODEJS_COPY_CMD)
+}
+
 # TS_TYPECHECK
 
 _TS_TYPECHECK_VALUE=none

build/export_generators/gradle/generator.toml

@@ -102,4 +102,5 @@ kotlinc-flags="list"
 consumer-classpath="str"
 consumer-jar="str"
 consumer-type="str"
+consumer-proto_namespace="str"
 consumer-prebuilt="flag"

build/export_generators/ide-gradle/generator.toml

@@ -112,4 +112,5 @@ target_commands-flags="list"
 consumer-classpath="str"
 consumer-jar="str"
 consumer-type="str"
+consumer-proto_namespace="str"
 consumer-prebuilt="flag"

build/export_generators/ide-gradle/proto_prepare.jinja

@@ -33,15 +33,26 @@ val prepareMainProtos = tasks.register<Copy>("prepareMainProtos") {
 {%- if extractLibrariesProtosTask %}
 
 val extractMainLibrariesProtos = tasks.register<Copy>("extractMainLibrariesProtos") {
-{%- if libraries|length %}
+{%- set root_libraries = libraries|rejectattr('proto_namespace') -%}
+{%- set ns_libraries = libraries|selectattr('proto_namespace') -%}
+{%- if root_libraries|length %}
     from("$arcadia_root") {
-{#- list of all library directories -#}
-{%-     for library in libraries -%}
+{%-     for library in root_libraries -%}
 {%-         set path_and_jar = rsplit(library.jar, '/', 2) %}
         include("{{ path_and_jar[0] }}/**/*.proto")
 {%-     endfor %}
     }
-{%  endif -%}
+{%- endif -%}
+{%- if ns_libraries|length -%}
+{%-     for library in ns_libraries -%}
+{%-         set path_and_jar = rsplit(library.jar, '/', 2) -%}
+{%-         set path = "#R/" + path_and_jar[0] -%}
+{%-         set path = path|replace("#R/" + library.proto_namespace + "/", "")|replace("#R/", "") %}
+    from("$arcadia_root/{{ library.proto_namespace }}") {
+        include("{{ path }}/**/*.proto")
+    }
+{%-     endfor -%}
+{%- endif %}
     into(mainExtractedIncludeProtosDir)
 }
 {%- endif %}

build/platform/clang/arch.cmake

@@ -4,6 +4,8 @@ IF (ARCH_I386 OR ARCH_I686)
     SET(CLANG_ARCH i386)
 ELSEIF (ARCH_X86_64)
     SET(CLANG_ARCH x86_64)
+ELSEIF (ARCH_ARM6)
+    SET(CLANG_ARCH armv6)
 ELSEIF (ARCH_ARM7 OR ARCH_ARM7_NEON)
     SET(CLANG_ARCH armv7)
 ELSEIF (ARCH_ARM64 OR ARCH_AARCH64)

build/platform/linux_sdk/ya.make

@@ -44,6 +44,12 @@ ELSEIF (ARCH_PPC64LE)
     ELSE()
         MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for PPC64LE")
     ENDIF()
+ELSEIF (ARCH_ARM6)
+    IF (ARM6_FLOAT_ABI == "hard" AND OS_SDK == "ubuntu-16")
+        DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1323200692)
+    ELSE()
+        MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for ARMv6 32 bit (float ABI: ${ARM6_FLOAT_ABI})")
+    ENDIF()
 ELSEIF (ARCH_ARM7)
     IF (ARM7_FLOAT_ABI == "hard" AND OS_SDK == "ubuntu-16")
         DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1323200692)

build/plugins/nots.py

@@ -893,8 +893,13 @@ def on_ts_test_for_configure(
 
     for_mod_path = df.TsTestForPath.value(unit, (), {})[df.TsTestForPath.KEY]
     unit.onpeerdir([for_mod_path])
+
+    # user-defined recipes should be in the end
+    user_recipes = unit.get("TEST_RECIPES_VALUE").replace("$TEST_RECIPES_VALUE", "").strip()
+    unit.set(["TEST_RECIPES_VALUE", ""])
     unit.on_setup_extract_node_modules_recipe([for_mod_path])
     unit.on_setup_extract_output_tars_recipe([for_mod_path])
+    __set_append(unit, "TEST_RECIPES_VALUE", user_recipes)
 
     build_root = "$B" if test_runner in [TsTestType.HERMIONE, TsTestType.PLAYWRIGHT_LARGE] else "$(BUILD_ROOT)"
     unit.set(["TS_TEST_NM", os.path.join(build_root, for_mod_path, node_modules_filename)])

build/ya.conf.json

@@ -1612,6 +1612,16 @@
                         "os": "IOSSIM"
                     }
                 },
+                {
+                    "default": true,
+                    "host": {
+                        "os": "LINUX"
+                    },
+                    "target": {
+                        "arch": "armv6hf",
+                        "os": "LINUX"
+                    }
+                },
                 {
                     "default": true,
                     "host": {