intermediate changes

ref:e3f6ec2955af3884251b007bc0229d66aea08b19

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

@@ -1,16 +1,16 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2778996783)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2778967851)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2764984950)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2764990673)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2778996190)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2778967536)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2764984688)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2764990185)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2778995656)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2778966658)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2764984559)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2764990014)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2778996977)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2778968194)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2764985330)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2764990852)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2778995317)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2778966154)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:2764984404)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:2764989842)
 ENDIF()

build/sysincl/misc.yml

@@ -255,11 +255,11 @@
     - sasl/sasl.h
     - sasl/saslutil.h
 
-- source_filter: "^contrib/libs/apr"
+- source_filter: "^contrib/libs/apache/apr"
   includes:
     - atomic.h
 
-- source_filter: "^contrib/libs/(apr|httpd|llvm)"
+- source_filter: "^contrib/libs/(apache/apr|httpd|llvm)"
   includes:
     - uuid.h
     - uuid/uuid.h
@@ -328,7 +328,7 @@
   includes:
     - config.h
 
-- source_filter: "^contrib/libs/(apr|httpd|openssl)"
+- source_filter: "^contrib/libs/(apache/apr|httpd|openssl)"
   includes:
     - netinet/sctp.h
 

contrib/libs/apache/ya.make

@@ -4,6 +4,7 @@ OWNER(
 )
 
 RECURSE(
+    apr
     apr-util
     arrow
     avro

contrib/libs/ya.make

@@ -7,7 +7,6 @@ RECURSE(
     afl
     antlr4_cpp_runtime
     apache
-    apr
     asio
     asmlib
     authparser