diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-12-13 18:45:29 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-12-14 11:03:03 +0100 |
| commit | 1d8235f5b899a2cd8414522b2d72b96fab91577b (patch) | |
| tree | 2ab56dce064de872525db7f24ba150a9065c4757 /platform/android/src | |
| parent | c2a4a8822ce9577c972975da61034a30fb0fe3e9 (diff) | |
| download | qtlocation-mapboxgl-1d8235f5b899a2cd8414522b2d72b96fab91577b.tar.gz | |
[build] rework platform/default directory and add -files.txt for vendored libs
Diffstat (limited to 'platform/android/src')
| -rw-r--r-- | platform/android/src/file_source.cpp | 2 | ||||
| -rwxr-xr-x | platform/android/src/jni.cpp | 4 | ||||
| -rw-r--r-- | platform/android/src/text/collator.cpp | 2 | ||||
| -rw-r--r-- | platform/android/src/unaccent.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp index 9b639d2610..daddd0b9cd 100644 --- a/platform/android/src/file_source.cpp +++ b/platform/android/src/file_source.cpp @@ -6,7 +6,7 @@ #include <mbgl/storage/resource_transform.hpp> #include <mbgl/util/logging.hpp> -#include <sqlite3.hpp> +#include <mbgl/storage/sqlite3.hpp> #include "asset_manager_file_source.hpp" diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index 8c1e45f7d3..45b3e02252 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -1,8 +1,6 @@ #include "jni.hpp" #include <mbgl/util/logging.hpp> -#include <src/style/formatted.hpp> -#include <src/style/formatted_section.hpp> #include "annotation/marker.hpp" #include "annotation/polygon.hpp" @@ -46,6 +44,8 @@ #include "style/layers/layer_manager.hpp" #include "style/sources/source.hpp" #include "style/light.hpp" +#include "style/formatted.hpp" +#include "style/formatted_section.hpp" #include "snapshotter/map_snapshotter.hpp" #include "snapshotter/map_snapshot.hpp" #include "text/collator_jni.hpp" diff --git a/platform/android/src/text/collator.cpp b/platform/android/src/text/collator.cpp index 381851eff2..acb4f36ee1 100644 --- a/platform/android/src/text/collator.cpp +++ b/platform/android/src/text/collator.cpp @@ -2,7 +2,7 @@ #include <mbgl/text/language_tag.hpp> #include <mbgl/util/platform.hpp> -#include <unaccent.hpp> +#include <mbgl/text/unaccent.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/unaccent.cpp b/platform/android/src/unaccent.cpp index bc2ec354d6..8da0ce4931 100644 --- a/platform/android/src/unaccent.cpp +++ b/platform/android/src/unaccent.cpp @@ -1,4 +1,4 @@ -#include <unaccent.hpp> +#include <mbgl/text/unaccent.hpp> #include <string> #include "attach_env.hpp" #include "text/collator_jni.hpp" |