diff options
Diffstat (limited to 'platform/android/src')
| -rw-r--r-- | platform/android/src/connectivity_listener.cpp | 2 | ||||
| -rw-r--r-- | platform/android/src/example_custom_layer.cpp | 2 | ||||
| -rw-r--r-- | platform/android/src/geometry/conversion/feature.hpp | 2 | ||||
| -rw-r--r-- | platform/android/src/http_file_source.cpp | 2 | ||||
| -rwxr-xr-x | platform/android/src/jni.cpp | 4 | ||||
| -rw-r--r-- | platform/android/src/logging_android.cpp (renamed from platform/android/src/log_android.cpp) | 2 | ||||
| -rwxr-xr-x | platform/android/src/native_map_view.cpp | 6 | ||||
| -rw-r--r-- | platform/android/src/run_loop.cpp | 2 | ||||
| -rw-r--r-- | platform/android/src/style/android_conversion.hpp | 2 | ||||
| -rw-r--r-- | platform/android/src/style/conversion/geojson.hpp | 2 | ||||
| -rw-r--r-- | platform/android/src/style/layers/custom_layer.cpp | 2 | ||||
| -rw-r--r-- | platform/android/src/style/layers/layer.cpp | 2 | ||||
| -rw-r--r-- | platform/android/src/style/sources/source.cpp | 2 | ||||
| -rw-r--r-- | platform/android/src/thread.cpp | 4 |
14 files changed, 18 insertions, 18 deletions
diff --git a/platform/android/src/connectivity_listener.cpp b/platform/android/src/connectivity_listener.cpp index df5c60a485..cc2f0a4a81 100644 --- a/platform/android/src/connectivity_listener.cpp +++ b/platform/android/src/connectivity_listener.cpp @@ -1,7 +1,7 @@ #include "connectivity_listener.hpp" #include <mbgl/storage/network_status.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/example_custom_layer.cpp b/platform/android/src/example_custom_layer.cpp index 0fb0287f3d..c55c9c3527 100644 --- a/platform/android/src/example_custom_layer.cpp +++ b/platform/android/src/example_custom_layer.cpp @@ -1,7 +1,7 @@ #include <jni.h> #include <GLES2/gl2.h> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/style/layers/custom_layer.hpp> diff --git a/platform/android/src/geometry/conversion/feature.hpp b/platform/android/src/geometry/conversion/feature.hpp index 9f75b9c8f1..f0c77c3389 100644 --- a/platform/android/src/geometry/conversion/feature.hpp +++ b/platform/android/src/geometry/conversion/feature.hpp @@ -16,7 +16,7 @@ #include <vector> #include <sstream> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> namespace mbgl { namespace android { diff --git a/platform/android/src/http_file_source.cpp b/platform/android/src/http_file_source.cpp index ed4d81391f..ee1429bd74 100644 --- a/platform/android/src/http_file_source.cpp +++ b/platform/android/src/http_file_source.cpp @@ -1,7 +1,7 @@ #include <mbgl/storage/http_file_source.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/async_task.hpp> #include <mbgl/util/util.hpp> diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index c7f53d028b..0c740d7fdd 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -25,8 +25,8 @@ #include <mbgl/style/layer.hpp> #include <mbgl/style/source.hpp> #include <mbgl/sprite/sprite_image.hpp> -#include <mbgl/platform/event.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/event.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/util/exception.hpp> #include <mbgl/util/optional.hpp> diff --git a/platform/android/src/log_android.cpp b/platform/android/src/logging_android.cpp index e5c8cfd812..2e025c059f 100644 --- a/platform/android/src/log_android.cpp +++ b/platform/android/src/logging_android.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <android/log.h> diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 984fe9d382..83f351b7b3 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -10,9 +10,9 @@ #include <sys/system_properties.h> -#include <mbgl/platform/platform.hpp> -#include <mbgl/platform/event.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/platform.hpp> +#include <mbgl/util/event.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/gl/extension.hpp> #include <mbgl/gl/context.hpp> #include <mbgl/util/constants.hpp> diff --git a/platform/android/src/run_loop.cpp b/platform/android/src/run_loop.cpp index 1e5fc9b4ba..170b05c23c 100644 --- a/platform/android/src/run_loop.cpp +++ b/platform/android/src/run_loop.cpp @@ -1,6 +1,6 @@ #include "run_loop_impl.hpp" -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> #include <mbgl/util/thread_context.hpp> #include <mbgl/util/thread_local.hpp> #include <mbgl/util/timer.hpp> diff --git a/platform/android/src/style/android_conversion.hpp b/platform/android/src/style/android_conversion.hpp index cea7ce6d2a..de0ac91502 100644 --- a/platform/android/src/style/android_conversion.hpp +++ b/platform/android/src/style/android_conversion.hpp @@ -2,7 +2,7 @@ #include "value.hpp" -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/style/conversion.hpp> #include <mbgl/util/feature.hpp> #include <mbgl/util/optional.hpp> diff --git a/platform/android/src/style/conversion/geojson.hpp b/platform/android/src/style/conversion/geojson.hpp index 920c670fcb..6bc48b3700 100644 --- a/platform/android/src/style/conversion/geojson.hpp +++ b/platform/android/src/style/conversion/geojson.hpp @@ -6,7 +6,7 @@ #include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/geojson.hpp> #include <mbgl/util/rapidjson.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <jni/jni.hpp> #include <sstream> diff --git a/platform/android/src/style/layers/custom_layer.cpp b/platform/android/src/style/layers/custom_layer.cpp index 6568455c67..d5d330a019 100644 --- a/platform/android/src/style/layers/custom_layer.cpp +++ b/platform/android/src/style/layers/custom_layer.cpp @@ -2,7 +2,7 @@ #include <string> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> namespace mbgl { namespace android { diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index 00a52147b8..c0c57c839d 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -3,7 +3,7 @@ #include <jni/jni.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> //Java -> C++ conversion #include <mbgl/style/conversion.hpp> diff --git a/platform/android/src/style/sources/source.cpp b/platform/android/src/style/sources/source.cpp index 36023d2ff7..aca7bd6a84 100644 --- a/platform/android/src/style/sources/source.cpp +++ b/platform/android/src/style/sources/source.cpp @@ -3,7 +3,7 @@ #include <jni/jni.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> //Java -> C++ conversion #include <mbgl/style/conversion.hpp> diff --git a/platform/android/src/thread.cpp b/platform/android/src/thread.cpp index 77f9815866..c708dfdceb 100644 --- a/platform/android/src/thread.cpp +++ b/platform/android/src/thread.cpp @@ -1,5 +1,5 @@ -#include <mbgl/platform/log.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/logging.hpp> +#include <mbgl/util/platform.hpp> #include <sys/prctl.h> #include <sys/resource.h> |