diff --git a/android/jni/Android.mk b/android/jni/Android.mk index d3159fc45f..4661625ae7 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -26,9 +26,9 @@ define add_prebuild_static_lib endef prebuild_static_libs := map tracking routing traffic routing_common drape_frontend search storage -prebuild_static_libs += ugc indexer drape platform editor partners_api local_ads mwm_diff geometry -prebuild_static_libs += coding base opening_hours pugixml oauthcpp expat freetype minizip jansson -prebuild_static_libs += protobuf osrm stats_client succinct stb_image sdf_image icu agg +prebuild_static_libs += ugc indexer drape platform editor partners_api local_ads mwm_diff bsdiff +prebuild_static_libs += geometry coding base opening_hours pugixml oauthcpp expat freetype minizip +prebuild_static_libs += jansson protobuf osrm stats_client succinct stb_image sdf_image icu agg $(foreach item,$(prebuild_static_libs),$(eval $(call add_prebuild_static_lib,$(item)))) diff --git a/feature_list/feature_list.pro b/feature_list/feature_list.pro index 756a038f9e..83048f9e21 100644 --- a/feature_list/feature_list.pro +++ b/feature_list/feature_list.pro @@ -2,7 +2,7 @@ ROOT_DIR = .. DEPENDENCIES = map traffic search_tests_support search search_quality storage ugc indexer platform \ - editor mwm_diff geometry coding base jansson protobuf stats_client succinct \ + editor mwm_diff bsdiff geometry coding base jansson protobuf stats_client succinct \ opening_hours pugixml icu agg include($$ROOT_DIR/common.pri) diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt index 6f5752e391..1c77f52720 100644 --- a/map/map_tests/CMakeLists.txt +++ b/map/map_tests/CMakeLists.txt @@ -39,6 +39,7 @@ omim_link_libraries( platform editor mwm_diff + bsdiff geometry coding base diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro index d592b2d585..fa8c562e1f 100644 --- a/map/map_tests/map_tests.pro +++ b/map/map_tests/map_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map drape_frontend routing traffic routing_common search storage tracking drape \ - ugc indexer partners_api local_ads platform editor mwm_diff geometry coding base \ + ugc indexer partners_api local_ads platform editor mwm_diff bsdiff geometry coding base \ freetype expat protobuf jansson osrm stats_client minizip succinct pugixml \ stats_client stb_image sdf_image icu agg diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt index 549279852e..7730786e92 100644 --- a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt +++ b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt @@ -45,6 +45,7 @@ omim_link_libraries( platform editor mwm_diff + bsdiff geometry coding base diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 56e4093e34..177e01b394 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -78,6 +78,7 @@ omim_link_libraries( ${PROJECT_NAME} qt_common mwm_diff + bsdiff map drape_frontend routing diff --git a/qt/qt.pro b/qt/qt.pro index 9fc6c5d72a..00b9cfeeba 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -3,8 +3,8 @@ ROOT_DIR = .. DEPENDENCIES = qt_common map drape_frontend openlr routing search storage tracking traffic \ routing_common ugc indexer drape partners_api local_ads platform editor mwm_diff \ - geometry coding base freetype expat gflags jansson protobuf osrm stats_client \ - minizip succinct pugixml oauthcpp stb_image sdf_image icu + bsdiff geometry coding base freetype expat gflags jansson protobuf osrm \ + stats_client minizip succinct pugixml oauthcpp stb_image sdf_image icu DEPENDENCIES += opening_hours \ diff --git a/search/search_integration_tests/CMakeLists.txt b/search/search_integration_tests/CMakeLists.txt index cb782e4905..4e8a202ecf 100644 --- a/search/search_integration_tests/CMakeLists.txt +++ b/search/search_integration_tests/CMakeLists.txt @@ -31,6 +31,7 @@ omim_link_libraries( editor platform mwm_diff + bsdiff geometry coding base diff --git a/search/search_integration_tests/search_integration_tests.pro b/search/search_integration_tests/search_integration_tests.pro index b893428c80..663297ad05 100644 --- a/search/search_integration_tests/search_integration_tests.pro +++ b/search/search_integration_tests/search_integration_tests.pro @@ -9,7 +9,7 @@ ROOT_DIR = ../.. DEPENDENCIES = generator_tests_support search_tests_support indexer_tests_support generator \ routing routing_common search storage stats_client indexer platform editor mwm_diff \ - geometry coding base tess2 protobuf jansson succinct pugixml opening_hours icu + bsdiff geometry coding base tess2 protobuf jansson succinct pugixml opening_hours icu include($$ROOT_DIR/common.pri) diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt index c6ae15c9ce..0ba92f9b21 100644 --- a/search/search_quality/assessment_tool/CMakeLists.txt +++ b/search/search_quality/assessment_tool/CMakeLists.txt @@ -53,6 +53,7 @@ omim_link_libraries( platform editor mwm_diff + bsdiff geometry coding base diff --git a/search/search_quality/features_collector_tool/CMakeLists.txt b/search/search_quality/features_collector_tool/CMakeLists.txt index d4dfd98ab9..4889eb81a7 100644 --- a/search/search_quality/features_collector_tool/CMakeLists.txt +++ b/search/search_quality/features_collector_tool/CMakeLists.txt @@ -16,6 +16,7 @@ omim_link_libraries( editor platform mwm_diff + bsdiff geometry coding base diff --git a/search/search_quality/features_collector_tool/features_collector_tool.pro b/search/search_quality/features_collector_tool/features_collector_tool.pro index 7b589d5863..1738a34cea 100644 --- a/search/search_quality/features_collector_tool/features_collector_tool.pro +++ b/search/search_quality/features_collector_tool/features_collector_tool.pro @@ -8,9 +8,9 @@ TEMPLATE = app ROOT_DIR = ../../.. # todo(@m) revise DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search \ - search_quality storage ugc indexer drape platform editor mwm_diff geometry coding \ - base freetype expat gflags jansson protobuf osrm stats_client minizip succinct \ - opening_hours pugixml stb_image sdf_image icu agg + search_quality storage ugc indexer drape platform editor mwm_diff bsdiff geometry \ + coding base freetype expat gflags jansson protobuf osrm stats_client minizip \ + succinct opening_hours pugixml stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) diff --git a/search/search_quality/search_quality_tool/CMakeLists.txt b/search/search_quality/search_quality_tool/CMakeLists.txt index 5d06e5353b..6c2eacb4c0 100644 --- a/search/search_quality/search_quality_tool/CMakeLists.txt +++ b/search/search_quality/search_quality_tool/CMakeLists.txt @@ -17,6 +17,7 @@ omim_link_libraries( editor platform mwm_diff + bsdiff geometry coding base diff --git a/search/search_quality/search_quality_tool/search_quality_tool.pro b/search/search_quality/search_quality_tool/search_quality_tool.pro index 38d3837cef..65c22ae423 100644 --- a/search/search_quality/search_quality_tool/search_quality_tool.pro +++ b/search/search_quality/search_quality_tool/search_quality_tool.pro @@ -8,9 +8,9 @@ TEMPLATE = app ROOT_DIR = ../../.. # todo(@m) revise DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search \ - search_quality storage ugc indexer drape platform editor mwm_diff geometry coding \ - base freetype expat gflags jansson protobuf osrm stats_client minizip succinct \ - opening_hours pugixml stb_image sdf_image icu agg + search_quality storage ugc indexer drape platform editor mwm_diff bsdiff geometry \ + coding base freetype expat gflags jansson protobuf osrm stats_client minizip \ + succinct opening_hours pugixml stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt index 505e5733f4..b0fb971a2a 100644 --- a/storage/storage_integration_tests/CMakeLists.txt +++ b/storage/storage_integration_tests/CMakeLists.txt @@ -37,6 +37,7 @@ omim_link_libraries( editor opening_hours mwm_diff + bsdiff geometry coding base diff --git a/storage/storage_integration_tests/storage_integration_tests.pro b/storage/storage_integration_tests/storage_integration_tests.pro index 153b3cda08..0f2ce01fdf 100644 --- a/storage/storage_integration_tests/storage_integration_tests.pro +++ b/storage/storage_integration_tests/storage_integration_tests.pro @@ -8,8 +8,8 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common ugc \ indexer drape partners_api local_ads platform_tests_support platform editor \ - mwm_diff opening_hours geometry coding base freetype expat jansson protobuf osrm \ - stats_client minizip succinct pugixml oauthcpp stb_image sdf_image icu agg + mwm_diff bsdiff opening_hours geometry coding base freetype expat jansson protobuf \ + osrm stats_client minizip succinct pugixml oauthcpp stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt index be98bc6e3d..ca66f18a16 100644 --- a/storage/storage_tests/CMakeLists.txt +++ b/storage/storage_tests/CMakeLists.txt @@ -42,6 +42,7 @@ omim_link_libraries( platform opening_hours mwm_diff + bsdiff geometry coding base diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro index fd717a1993..4b914c238f 100644 --- a/storage/storage_tests/storage_tests.pro +++ b/storage/storage_tests/storage_tests.pro @@ -12,9 +12,9 @@ DEPENDENCIES = generator_tests_support generator } DEPENDENCIES *= drape_frontend map routing traffic routing_common search storage indexer drape \ - platform_tests_support platform editor mwm_diff opening_hours geometry \ - coding base freetype expat jansson tess2 protobuf osrm stats_client \ - minizip succinct pugixml oauthcpp stb_image sdf_image icu agg + platform_tests_support platform editor mwm_diff bsdiff opening_hours geometry \ + coding base freetype expat jansson tess2 protobuf osrm stats_client minizip \ + succinct pugixml oauthcpp stb_image sdf_image icu agg include($$ROOT_DIR/common.pri) diff --git a/track_analyzing/track_analyzer/CMakeLists.txt b/track_analyzing/track_analyzer/CMakeLists.txt index 367c9e8512..a293fbd0c6 100644 --- a/track_analyzing/track_analyzer/CMakeLists.txt +++ b/track_analyzing/track_analyzer/CMakeLists.txt @@ -27,6 +27,7 @@ omim_link_libraries( editor platform mwm_diff + bsdiff geometry coding base