diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-02-15 11:54:51 -0500 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-02-15 11:54:51 -0500 |
| commit | 903e7989ec3438a605bafbf5938de38cdb868e4a (patch) | |
| tree | a2f8ba01fd8bf41503396605b993f9e38b77e131 /platform/android/scripts/exclude-activity-gen.json | |
| parent | c83dc310aa656132638a66e65ba8aa274b5e969f (diff) | |
| parent | 82de856c94bbc090ba30186011610da5e233e277 (diff) | |
| download | qtlocation-mapboxgl-903e7989ec3438a605bafbf5938de38cdb868e4a.tar.gz | |
Merge branch 'master' into release-boba
# Conflicts:
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
# platform/android/scripts/exclude-activity-gen.json
# platform/ios/CHANGELOG.md
# platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
# platform/ios/Mapbox-iOS-SDK-symbols.podspec
# platform/ios/Mapbox-iOS-SDK.podspec
# platform/macos/CHANGELOG.md
Diffstat (limited to 'platform/android/scripts/exclude-activity-gen.json')
| -rw-r--r-- | platform/android/scripts/exclude-activity-gen.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/scripts/exclude-activity-gen.json b/platform/android/scripts/exclude-activity-gen.json index 2170c4d9f8..1d61d93943 100644 --- a/platform/android/scripts/exclude-activity-gen.json +++ b/platform/android/scripts/exclude-activity-gen.json @@ -27,6 +27,7 @@ "QueryRenderedFeaturesBoxHighlightActivity", "MultiMapActivity", "MapInDialogActivity", + "SimpleMapActivity", "ManualZoomActivity", "MaxMinZoomActivity", "ScrollByActivity", @@ -34,4 +35,4 @@ "SymbolGeneratorActivity", "TextureViewTransparentBackgroundActivity", "SimpleMapActivity" -]
\ No newline at end of file +] |