diff options
| author | Thomas Moenicke <thomas.moenicke@mapbox.com> | 2020-02-03 19:10:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 19:10:57 +0200 |
| commit | b64ed754442b894f3914a4191798fbd2f2bc8cd9 (patch) | |
| tree | 59bb14829d7cdd5f2466dad4cffb74c4d1b80068 /platform/android | |
| parent | 2e10d3548a8b3aff1f28b9514594c3c14509f084 (diff) | |
| download | qtlocation-mapboxgl-b64ed754442b894f3914a4191798fbd2f2bc8cd9.tar.gz | |
[build] Adding a build flag to build without GL if needed (#16120)
* [build] Adding a build flag to build without GL if needed
* [build] Moving custom layer to mbgl/gl
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/src/example_custom_layer.cpp | 6 | ||||
| -rw-r--r-- | platform/android/src/style/layers/custom_layer.hpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/platform/android/src/example_custom_layer.cpp b/platform/android/src/example_custom_layer.cpp index e805532541..e1b80ffba5 100644 --- a/platform/android/src/example_custom_layer.cpp +++ b/platform/android/src/example_custom_layer.cpp @@ -1,8 +1,8 @@ -#include <jni.h> #include <GLES2/gl2.h> -#include <sstream> #include <android/log.h> -#include <mbgl/style/layers/custom_layer.hpp> +#include <jni.h> +#include <mbgl/gl/custom_layer.hpp> +#include <sstream> // DEBUGGING diff --git a/platform/android/src/style/layers/custom_layer.hpp b/platform/android/src/style/layers/custom_layer.hpp index 0d6f4a408d..dc328a2137 100644 --- a/platform/android/src/style/layers/custom_layer.hpp +++ b/platform/android/src/style/layers/custom_layer.hpp @@ -1,9 +1,9 @@ #pragma once -#include "layer.hpp" -#include <mbgl/layermanager/custom_layer_factory.hpp> -#include <mbgl/style/layers/custom_layer.hpp> #include <jni/jni.hpp> +#include <mbgl/gl/custom_layer.hpp> +#include <mbgl/gl/custom_layer_factory.hpp> +#include "layer.hpp" namespace mbgl { namespace android { |