move mapsmobi stuff to mapkit.conf

2 files changed, 9 insertions, 13 deletions

diff --git a/build/conf/project_specific/maps/mapkit.conf b/build/conf/project_specific/maps/mapkit.conf
index 8fdb763a5a3..52afc6151a3 100644
--- a/build/conf/project_specific/maps/mapkit.conf
+++ b/build/conf/project_specific/maps/mapkit.conf
@@ -331,6 +331,10 @@ when ($MAPSMOBI_BUILD_TARGET && $OS_IOS) {
         CFLAGS+=-DBUILDING_WITH_VULKAN_IOS
         BUILDING_WITH_VULKAN_IOS=yes
     }
+    BUILD_IOS_APP=yes
+    when ($ARCH_ARM7 || $ARCH_ARM64) {
+        BOOSTTEST_IS_FAT_OBJECT=yes
+    }
 }
 when ($MAPSMOBI_BUILD_TARGET && $OS_LINUX) {
     when ($NO_GRAPHICS != "yes") {
@@ -349,3 +353,7 @@ when ($MAPSMOBI_BUILD_TARGET && $OS_YOCTO) {
     CFLAGS+=-DBOOST_SYMBOL_EXPORT=
     CFLAGS+=-DBOOST_SYMBOL_VISIBLE=
 }
+when ($MAPSMOBI_BUILD_TARGET == "yes" && $OS_LINUX != "yes") {
+    ARCADIA_CURL_DNS_RESOLVER=MULTITHREADED
+}
+
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index d806c671451..343d2105867 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -172,23 +172,11 @@ when ($OS_ANDROID == "yes") {
     PIE=yes
 }
 
-# TODO: extract to conf/maps/maps.conf
-when ($MAPSMOBI_BUILD_TARGET == "yes" && $OS_LINUX != "yes") {
-    USE_STL_SYSTEM=yes
-    ARCADIA_CURL_DNS_RESOLVER=MULTITHREADED
-}
-when ($MAPSMOBI_BUILD_TARGET == "yes" && $OS_IOS == "yes") {
-    BUILD_IOS_APP=yes
-    when ($ARCH_ARM7 || $ARCH_ARM64) {
-        BOOSTTEST_IS_FAT_OBJECT=yes
-    }
-}
-
 when ($CLANG && $OS_DARWIN && $SANITIZER_TYPE && $SANITIZER_TYPE != "no") {
     SO_OUTPUTS=yes
 }
 
-when ($OS_NONE == "yes") {
+when ($OS_NONE == "yes" || $MAPSMOBI_BUILD_TARGET == "yes" && $OS_LINUX != "yes") {
     USE_STL_SYSTEM=yes
 }