summaryrefslogtreecommitdiff
path: root/platform/android/src/jni_native.cpp
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-09-25 17:37:48 +0300
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2019-09-26 10:56:44 +0300
commit82eabac126f98a46145c5af3dcfea20e75b60f68 (patch)
treef4007c92ef79487c5ff4bd8f799ac8bd66bf0d00 /platform/android/src/jni_native.cpp
parente5cdc4ecf362dadf2da148a22cf97aaf3c9c4ecf (diff)
downloadqtlocation-mapboxgl-upstream/alexshalamov_get_android_asset_manager.tar.gz
[android] Remove usage of ResourceOptions::withPlatformContextupstream/alexshalamov_get_android_asset_manager
Diffstat (limited to 'platform/android/src/jni_native.cpp')
-rw-r--r--platform/android/src/jni_native.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/src/jni_native.cpp b/platform/android/src/jni_native.cpp
index 9fe14f8f1f..bcbdfcf484 100644
--- a/platform/android/src/jni_native.cpp
+++ b/platform/android/src/jni_native.cpp
@@ -6,8 +6,8 @@
#include "bitmap.hpp"
#include "bitmap_factory.hpp"
#include "connectivity_listener.hpp"
-#include "conversion/conversion.hpp"
#include "conversion/collection.hpp"
+#include "conversion/conversion.hpp"
#include "file_source.hpp"
#include "geojson/feature.hpp"
#include "geojson/feature_collection.hpp"
@@ -32,6 +32,7 @@
#include "java_types.hpp"
#include "map_renderer.hpp"
#include "map_renderer_runnable.hpp"
+#include "mapbox.hpp"
#include "native_map_view.hpp"
#ifndef MBGL_MODULE_OFFLINE_DISABLE
#include "offline/offline_manager.hpp"
@@ -158,6 +159,9 @@ void registerNatives(JavaVM *vm) {
// Logger
Logger::registerNative(env);
+
+ // AssetManager
+ Mapbox::registerNative(env);
}
} // namespace android