Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[Android] Allow offline and snapshotter to be disabled. #13730

Merged
merged 2 commits into from
Jan 17, 2019
Merged

[Android] Allow offline and snapshotter to be disabled. #13730

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ecb8f9
[Android] Allow offline and snapshotter to be disabled.
mueschm Jan 14, 2019
536bd3c
Added MBGL_ before each of the flags
mueschm Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions platform/android/src/jni.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,23 @@
#include "map_renderer.hpp"
#include "map_renderer_runnable.hpp"
#include "native_map_view.hpp"
#ifndef MBGL_MODULE_OFFLINE_DISABLE
#include "offline/offline_manager.hpp"
#include "offline/offline_region.hpp"
#include "offline/offline_region_definition.hpp"
#include "offline/offline_region_error.hpp"
#include "offline/offline_region_status.hpp"
#endif
#include "style/transition_options.hpp"
#include "style/layers/layer_manager.hpp"
#include "style/sources/source.hpp"
#include "style/light.hpp"
#include "style/formatted.hpp"
#include "style/formatted_section.hpp"
#ifndef MBGL_MODULE_SNAPSHOT_DISABLE
#include "snapshotter/map_snapshotter.hpp"
#include "snapshotter/map_snapshot.hpp"
#endif
#include "text/collator_jni.hpp"
#include "text/local_glyph_rasterizer_jni.hpp"
#include "logger.hpp"
Expand Down Expand Up @@ -175,17 +179,21 @@ void registerNatives(JavaVM *vm) {
ConnectivityListener::registerNative(env);

// Offline
#ifndef MBGL_MODULE_OFFLINE_DISABLE
OfflineManager::registerNative(env);
OfflineRegion::registerNative(env);
OfflineRegionDefinition::registerNative(env);
OfflineTilePyramidRegionDefinition::registerNative(env);
OfflineGeometryRegionDefinition::registerNative(env);
OfflineRegionError::registerNative(env);
OfflineRegionStatus::registerNative(env);
#endif

// Snapshotter
#ifndef MBGL_MODULE_SNAPSHOT_DISABLE
MapSnapshotter::registerNative(env);
MapSnapshot::registerNative(env);
#endif

// text
LocalGlyphRasterizer::registerNative(env);
Expand Down