Disable symbols redefining for MAPSMOBI_BUILD_TARGET

commit_hash:9424e37bc99e6d61ff8496bf319539c6f1786669
yandex · Feb 11, 2025 · 435a67b · 435a67b
1 parent ef416bc
commit 435a67b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
@@ -347,6 +347,12 @@ LINK_EXEC_DYN_LIB=\
 _LD_LINK_LIB_EXTRA_INPUT=
 _LD_TAIL_LINK_LIB=$AUTO_INPUT $_LD_LINK_LIB_EXTRA_INPUT ${hide;kv:"p AR"} $TOOLCHAIN_ENV ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
 _LD_ARCHIVER=$YMAKE_PYTHON ${input:"build/scripts/link_lib.py"} ${quo:AR_TOOL} $AR_TYPE $_LD_LLVM_AR_FORMAT $ARCADIA_BUILD_ROOT $_LD_AR_PLUGIN
+when ($MAPSMOBI_BUILD_TARGET == "yes") {
+    _LD_ARCHIVER+= "no-openssl3"
+} 
+otherwise {
+    _LD_ARCHIVER+= "enable-openssl3"
+}
 _LD_LIB_GENERATE_MF=$GENERATE_MF &&
 when ($TIDY == "yes") {
     _LD_ARCHIVER=$YMAKE_PYTHON ${input:"build/scripts/clang_tidy_arch.py"} --source-root $ARCADIA_ROOT --build-root $ARCADIA_BUILD_ROOT --output-file

diff --git a/build/scripts/link_lib.py b/build/scripts/link_lib.py
@@ -12,8 +12,9 @@ def __init__(self, args):
         self.llvm_ar_format = args[2]
         self.build_root = args[3]
         self.plugin = args[4]
-        self.output = args[5]
-        auto_input = args[6:]
+        self.enable_openssl3 = args[5]
+        self.output = args[6]
+        auto_input = args[7:]
 
         self.need_modify = False
         self.extra_args = []
@@ -162,5 +163,5 @@ def call():
     if exit_code != 0:
         raise Exception('{0} returned non-zero exit code {1}. Stop.'.format(' '.join(cmd), exit_code))
 
-    if os.path.basename(opts.output) in ['libcontrib-libs-openssl.a', 'liblibs-openssl-crypto.a']:
+    if opts.enable_openssl3 != 'no-openssl3' and os.path.basename(opts.output) in ['libcontrib-libs-openssl.a', 'liblibs-openssl-crypto.a']:
         rename_syms(os.path.dirname(opts.archiver) + '/', opts.output)
diff --git a/contrib/libs/openssl/ya.make b/contrib/libs/openssl/ya.make
@@ -52,6 +52,10 @@ IF (EXPORT_CMAKE)
     CFLAGS(GLOBAL -DOPENSSL_DONT_ADD_VERSION_PREFIX)
 ENDIF()
 
+IF (MAPSMOBI_BUILD_TARGET)
+    CFLAGS(GLOBAL -DOPENSSL_DONT_ADD_VERSION_PREFIX)
+ENDIF()
+
 IF (NOT EXPORT_CMAKE OR NOT OPENSOURCE_REPLACE_OPENSSL)
 
 IF (OS_LINUX)