[ads] all ads-related files are moved into own directory

android/jni/com/mapswithme/maps/Framework.cpp

@@ -13,11 +13,11 @@
 #include "map/user_mark.hpp"
 #include "map/purchase.hpp"
 
-#include "partners_api/ads_engine.hpp"
-#include "partners_api/banner.hpp"
+#include "partners_api/ads/ads_engine.hpp"
+#include "partners_api/ads/banner.hpp"
+#include "partners_api/ads/mopub_ads.hpp"
 #include "partners_api/booking_block_params.hpp"
 #include "partners_api/downloader_promo.hpp"
-#include "partners_api/mopub_ads.hpp"
 #include "partners_api/megafon_countries.hpp"
 
 #include "web_api/utils.hpp"

android/jni/com/mapswithme/maps/UserMarkHelper.cpp

@@ -3,8 +3,8 @@
 #include "map/elevation_info.hpp"
 #include "map/place_page_info.hpp"
 
-#include "partners_api/ads_engine.hpp"
-#include "partners_api/banner.hpp"
+#include "partners_api/ads/ads_engine.hpp"
+#include "partners_api/ads/banner.hpp"
 
 #include "base/string_utils.hpp"
 

map/framework.cpp

@@ -94,7 +94,7 @@
 #include "geometry/tree4d.hpp"
 #include "geometry/triangle2d.hpp"
 
-#include "partners_api/ads_engine.hpp"
+#include "partners_api/ads/ads_engine.hpp"
 #include "partners_api/opentable_api.hpp"
 #include "partners_api/partners.hpp"
 

map/framework.hpp

@@ -62,7 +62,7 @@
 
 #include "tracking/reporter.hpp"
 
-#include "partners_api/banner.hpp"
+#include "partners_api/ads/banner.hpp"
 #include "partners_api/booking_api.hpp"
 #include "partners_api/locals_api.hpp"
 #include "partners_api/promo_api.hpp"

map/place_page_info.cpp

@@ -4,8 +4,8 @@
 
 #include "descriptions/loader.hpp"
 
-#include "partners_api/ads_engine.hpp"
-#include "partners_api/banner.hpp"
+#include "partners_api/ads/ads_engine.hpp"
+#include "partners_api/ads/banner.hpp"
 #include "partners_api/partners.hpp"
 
 #include "editor/osm_editor.hpp"

partners_api/CMakeLists.txt

@@ -4,13 +4,21 @@ include_directories(${OMIM_ROOT}/3party/jansson/src)
 
 set(
   SRC
-  ads_base.cpp
-  ads_base.hpp
-  ads_engine.cpp
-  ads_engine.hpp
-  ads_utils.cpp
-  ads_utils.hpp
-  banner.hpp
+  ads/ads_base.cpp
+  ads/ads_base.hpp
+  ads/ads_engine.cpp
+  ads/ads_engine.hpp
+  ads/ads_utils.cpp
+  ads/ads_utils.hpp
+  ads/banner.hpp
+  ads/facebook_ads.cpp
+  ads/facebook_ads.hpp
+  ads/google_ads.cpp
+  ads/google_ads.hpp
+  ads/mopub_ads.cpp
+  ads/mopub_ads.hpp
+  ads/rb_ads.cpp
+  ads/rb_ads.hpp
   booking_api.cpp
   booking_api.hpp
   booking_availability_params.cpp
@@ -20,20 +28,14 @@ set(
   booking_params_base.hpp
   downloader_promo.cpp
   downloader_promo.hpp
-  facebook_ads.cpp
-  facebook_ads.hpp
   freenow_api.cpp
   freenow_api.hpp
-  google_ads.cpp
-  google_ads.hpp
   locals_api.cpp
   locals_api.hpp
   maxim_api.cpp
   maxim_api.hpp
   megafon_countries.cpp
   megafon_countries.hpp
-  mopub_ads.cpp
-  mopub_ads.hpp
   opentable_api.cpp
   opentable_api.hpp
   partners.cpp
@@ -42,8 +44,6 @@ set(
   promo_api.hpp
   promo_catalog_types.cpp
   promo_catalog_types.hpp
-  rb_ads.cpp
-  rb_ads.hpp
   rutaxi_api.cpp
   rutaxi_api.hpp
   taxi_base.cpp

partners_api/ads/ads_base.cpp

@@ -1,4 +1,4 @@
-#include "partners_api/ads_base.hpp"
+#include "partners_api/ads/ads_base.hpp"
 
 #include "partners_api/promo_catalog_types.hpp"
 

partners_api/ads/ads_base.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "partners_api/ads_utils.hpp"
+#include "partners_api/ads/ads_utils.hpp"
 
 #include "storage/storage_defines.hpp"
 

partners_api/ads/ads_engine.cpp

@@ -1,8 +1,9 @@
-#include "partners_api/ads_engine.hpp"
-#include "partners_api/facebook_ads.hpp"
-#include "partners_api/google_ads.hpp"
-#include "partners_api/mopub_ads.hpp"
-#include "partners_api/rb_ads.hpp"
+#include "partners_api/ads/ads_engine.hpp"
+
+#include "partners_api/ads/facebook_ads.hpp"
+#include "partners_api/ads/google_ads.hpp"
+#include "partners_api/ads/mopub_ads.hpp"
+#include "partners_api/ads/rb_ads.hpp"
 
 #include "indexer/feature_data.hpp"
 
@@ -17,7 +18,6 @@ Engine::Engine()
   m_poiBanners.emplace_back(Banner::Type::Mopub, std::make_unique<Mopub>());
 
   m_searchBanners.emplace_back(Banner::Type::Facebook, std::make_unique<FacebookSearch>());
-
 }
 
 std::vector<Banner> Engine::GetPoiBanners(feature::TypesHolder const & types,

partners_api/ads/ads_engine.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "partners_api/ads_base.hpp"
-#include "partners_api/banner.hpp"
+#include "partners_api/ads/ads_base.hpp"
+#include "partners_api/ads/banner.hpp"
 
 #include <memory>
 #include <string>

partners_api/ads/ads_utils.cpp

@@ -1,4 +1,4 @@
-#include "partners_api/ads_utils.hpp"
+#include "partners_api/ads/ads_utils.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
 

partners_api/ads/facebook_ads.cpp

@@ -1,4 +1,4 @@
-#include "partners_api/facebook_ads.hpp"
+#include "partners_api/ads/facebook_ads.hpp"
 
 namespace
 {

partners_api/ads/facebook_ads.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "partners_api/ads_base.hpp"
+#include "partners_api/ads/ads_base.hpp"
 
 namespace ads
 {

partners_api/ads/google_ads.cpp

@@ -1,4 +1,4 @@
-#include "partners_api/google_ads.hpp"
+#include "partners_api/ads/google_ads.hpp"
 
 namespace
 {

partners_api/ads/google_ads.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "partners_api/ads_base.hpp"
+#include "partners_api/ads/ads_base.hpp"
 
 namespace ads
 {

partners_api/ads/mopub_ads.cpp

@@ -1,7 +1,7 @@
-#include "partners_api/mopub_ads.hpp"
+#include "partners_api/ads/mopub_ads.hpp"
 #include "partners_api/partners.hpp"
 
-#include "private.h"
+#include "std/target_os.hpp"
 
 namespace
 {

partners_api/ads/mopub_ads.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "partners_api/ads_base.hpp"
+#include "partners_api/ads/ads_base.hpp"
 
 #include <string>
 

partners_api/ads/rb_ads.cpp

@@ -1,4 +1,4 @@
-#include "partners_api/rb_ads.hpp"
+#include "partners_api/ads/rb_ads.hpp"
 
 namespace
 {

partners_api/ads/rb_ads.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "partners_api/ads_base.hpp"
+#include "partners_api/ads/ads_base.hpp"
 
 namespace ads
 {

partners_api/partners_api_tests/ads_engine_tests.cpp

@@ -4,11 +4,11 @@
 #include "indexer/classificator_loader.hpp"
 #include "indexer/feature_data.hpp"
 
-#include "partners_api/ads_engine.hpp"
-#include "partners_api/facebook_ads.hpp"
-#include "partners_api/google_ads.hpp"
-#include "partners_api/mopub_ads.hpp"
-#include "partners_api/rb_ads.hpp"
+#include "partners_api/ads/ads_engine.hpp"
+#include "partners_api/ads/facebook_ads.hpp"
+#include "partners_api/ads/google_ads.hpp"
+#include "partners_api/ads/mopub_ads.hpp"
+#include "partners_api/ads/rb_ads.hpp"
 
 namespace
 {

partners_api/partners_api_tests/facebook_tests.cpp

@@ -4,7 +4,7 @@
 #include "indexer/classificator_loader.hpp"
 #include "indexer/feature_data.hpp"
 
-#include "partners_api/facebook_ads.hpp"
+#include "partners_api/ads/facebook_ads.hpp"
 
 namespace
 {

partners_api/partners_api_tests/google_tests.cpp

@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "partners_api/google_ads.hpp"
+#include "partners_api/ads/google_ads.hpp"
 
 UNIT_TEST(Google_BannerInSearch)
 {

partners_api/partners_api_tests/mopub_tests.cpp

@@ -4,7 +4,7 @@
 #include "indexer/classificator_loader.hpp"
 #include "indexer/feature_data.hpp"
 
-#include "partners_api/mopub_ads.hpp"
+#include "partners_api/ads/mopub_ads.hpp"
 
 namespace
 {

partners_api/partners_api_tests/rb_tests.cpp

@@ -4,7 +4,7 @@
 #include "indexer/classificator_loader.hpp"
 #include "indexer/feature_data.hpp"
 
-#include "partners_api/rb_ads.hpp"
+#include "partners_api/ads/rb_ads.hpp"
 
 namespace
 {