Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Pimenov <m@maps.me>2019-05-20 18:53:57 +0300
committerVlad Mihaylenko <vxmihaylenko@gmail.com>2019-05-21 13:40:48 +0300
commit17a02d356057c2981c1d136a6e16b426be81d957 (patch)
tree8a433d692f467d7930de9666e611823d2fe021e0 /android
parentef265805673726959c73785cee9669c62c29a2bb (diff)
[base] [coding] Moved file_name_utils.{c,h}pp from coding/ to base/.
Diffstat (limited to 'android')
-rw-r--r--android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp2
-rw-r--r--android/jni/com/mapswithme/maps/Framework.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp b/android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp
index 58b96fe797..82461fa8b2 100644
--- a/android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp
+++ b/android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp
@@ -2,7 +2,6 @@
#include "defines.hpp"
-#include "coding/file_name_utils.hpp"
#include "coding/internal/file_data.hpp"
#include "coding/reader_streambuf.hpp"
#include "coding/url_encode.hpp"
@@ -11,6 +10,7 @@
#include "platform/http_request.hpp"
#include "platform/servers_list.hpp"
+#include "base/file_name_utils.hpp"
#include "base/logging.hpp"
#include "base/string_utils.hpp"
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 62b8dca754..4fa353bbd7 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -28,7 +28,6 @@
#include "drape/visual_scale.hpp"
#include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
#include "geometry/angles.hpp"
#include "geometry/mercator.hpp"
@@ -48,6 +47,7 @@
#include "platform/settings.hpp"
#include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
#include "base/logging.hpp"
#include "base/math.hpp"
#include "base/sunrise_sunset.hpp"