diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2018-08-17 15:38:47 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2018-08-19 13:09:16 +0200 |
commit | 112bbc7ab289298094d6e6593437a71ec8029caa (patch) | |
tree | 229af7a6d7610e20edea65d565adbff9c9cd5f06 /platform/android | |
parent | 9df9f5fe2089a0dcd0d039115dec5cc63010603a (diff) | |
download | qtlocation-mapboxgl-112bbc7ab289298094d6e6593437a71ec8029caa.tar.gz |
[core] make style/conversion.hpp implementation private
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/config.cmake | 7 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 2 | ||||
-rw-r--r-- | platform/android/src/style/android_conversion.hpp | 2 | ||||
-rw-r--r-- | platform/android/src/style/conversion/filter.hpp | 2 | ||||
-rw-r--r-- | platform/android/src/style/conversion/latlngquad.hpp | 2 | ||||
-rw-r--r-- | platform/android/src/style/conversion/url_or_tileset.hpp | 2 | ||||
-rw-r--r-- | platform/android/src/style/layers/layer.cpp | 2 | ||||
-rw-r--r-- | platform/android/src/style/sources/geojson_source.cpp | 2 | ||||
-rw-r--r-- | platform/android/src/style/sources/image_source.cpp | 2 | ||||
-rw-r--r-- | platform/android/src/style/sources/source.cpp | 2 |
10 files changed, 15 insertions, 10 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index e76a447c88..be9d95ef0a 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -345,6 +345,11 @@ add_library(example-custom-layer SHARED platform/android/src/example_custom_layer.cpp ) +target_include_directories(example-custom-layer + PRIVATE include +) + target_link_libraries(example-custom-layer - PRIVATE mbgl-core + PRIVATE -llog + PRIVATE -lGLESv2 ) diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 8da44c10cb..8c76332b39 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -30,8 +30,8 @@ // Java -> C++ conversion #include "style/android_conversion.hpp" -#include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/filter.hpp> +#include <mbgl/style/conversion_impl.hpp> // C++ -> Java conversion #include "conversion/conversion.hpp" diff --git a/platform/android/src/style/android_conversion.hpp b/platform/android/src/style/android_conversion.hpp index 510a9f8444..8559720b2f 100644 --- a/platform/android/src/style/android_conversion.hpp +++ b/platform/android/src/style/android_conversion.hpp @@ -5,8 +5,8 @@ #include <mbgl/util/feature.hpp> #include <mbgl/util/logging.hpp> #include <mbgl/util/optional.hpp> -#include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/geojson.hpp> +#include <mbgl/style/conversion_impl.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/conversion/filter.hpp b/platform/android/src/style/conversion/filter.hpp index c154e88e7c..241c98713a 100644 --- a/platform/android/src/style/conversion/filter.hpp +++ b/platform/android/src/style/conversion/filter.hpp @@ -1,8 +1,8 @@ #pragma once #include "../android_conversion.hpp" -#include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/filter.hpp> +#include <mbgl/style/conversion_impl.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/conversion/latlngquad.hpp b/platform/android/src/style/conversion/latlngquad.hpp index 9d1a83e164..9588336855 100644 --- a/platform/android/src/style/conversion/latlngquad.hpp +++ b/platform/android/src/style/conversion/latlngquad.hpp @@ -1,8 +1,8 @@ #pragma once #include <mapbox/geojson.hpp> -#include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/geojson.hpp> +#include <mbgl/style/conversion_impl.hpp> #include <jni/jni.hpp> namespace mbgl { diff --git a/platform/android/src/style/conversion/url_or_tileset.hpp b/platform/android/src/style/conversion/url_or_tileset.hpp index 92c1182a63..d6bf86639c 100644 --- a/platform/android/src/style/conversion/url_or_tileset.hpp +++ b/platform/android/src/style/conversion/url_or_tileset.hpp @@ -4,8 +4,8 @@ #include <mbgl/util/variant.hpp> #include <mbgl/util/tileset.hpp> -#include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/tileset.hpp> +#include <mbgl/style/conversion_impl.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index c3ae9e40cd..6c08893411 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -18,10 +18,10 @@ #include <mbgl/util/logging.hpp> // Java -> C++ conversion -#include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/filter.hpp> #include <mbgl/style/conversion/layer.hpp> #include <mbgl/style/conversion/source.hpp> +#include <mbgl/style/conversion_impl.hpp> // C++ -> Java conversion #include "../conversion/property_value.hpp" diff --git a/platform/android/src/style/sources/geojson_source.cpp b/platform/android/src/style/sources/geojson_source.cpp index 6d9ab9e22c..14067503f1 100644 --- a/platform/android/src/style/sources/geojson_source.cpp +++ b/platform/android/src/style/sources/geojson_source.cpp @@ -5,9 +5,9 @@ // Java -> C++ conversion #include "../android_conversion.hpp" #include "../conversion/filter.hpp" -#include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/geojson.hpp> #include <mbgl/style/conversion/geojson_options.hpp> +#include <mbgl/style/conversion_impl.hpp> // C++ -> Java conversion #include "../../conversion/conversion.hpp" diff --git a/platform/android/src/style/sources/image_source.cpp b/platform/android/src/style/sources/image_source.cpp index 249387ea51..278564485d 100644 --- a/platform/android/src/style/sources/image_source.cpp +++ b/platform/android/src/style/sources/image_source.cpp @@ -5,7 +5,7 @@ // C++ -> Java conversion #include "../../conversion/conversion.hpp" -#include <mbgl/style/conversion.hpp> +#include <mbgl/style/conversion_impl.hpp> #include <mbgl/util/premultiply.hpp> #include "../../bitmap.hpp" diff --git a/platform/android/src/style/sources/source.cpp b/platform/android/src/style/sources/source.cpp index 8f14ebc43e..d2e2426c0b 100644 --- a/platform/android/src/style/sources/source.cpp +++ b/platform/android/src/style/sources/source.cpp @@ -7,8 +7,8 @@ #include <mbgl/util/logging.hpp> // Java -> C++ conversion -#include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/source.hpp> +#include <mbgl/style/conversion_impl.hpp> // C++ -> Java conversion #include "../conversion/property_value.hpp" |