diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 10:44:02 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 10:44:02 -0400 |
| commit | e08b6fe87f5824ab05a4cc67d9a76af5bb5ddd3b (patch) | |
| tree | 886e10260bfa044f62943186ec837b9ccd02934c /platform/android/config.cmake | |
| parent | 2bb785dad2489d04db179fa9cf65514640db0a96 (diff) | |
| parent | a45670cfb5752866b9c8130024a313944684c2db (diff) | |
| download | qtlocation-mapboxgl-e08b6fe87f5824ab05a4cc67d9a76af5bb5ddd3b.tar.gz | |
Merge branch 'release-boba' into masterupstream/fabian-merge-v4.0.0
# Conflicts:
# circle.yml
# include/mbgl/style/expression/let.hpp
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
# platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
# platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
# platform/android/gradle/dependencies.gradle
# platform/android/src/example_custom_layer.cpp
# platform/android/src/geojson/point.cpp
# platform/darwin/src/NSPredicate+MGLAdditions.mm
# platform/darwin/test/MGLExpressionTests.mm
# platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
# platform/ios/Mapbox-iOS-SDK-symbols.podspec
# platform/ios/Mapbox-iOS-SDK.podspec
# platform/ios/app/MBXViewController.m
# src/mbgl/renderer/layers/render_custom_layer.cpp
# src/mbgl/style/conversion/filter.cpp
# src/mbgl/style/expression/interpolate.cpp
# src/mbgl/style/expression/value.cpp
# test/style/filter.test.cpp
Diffstat (limited to 'platform/android/config.cmake')
| -rw-r--r-- | platform/android/config.cmake | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 30182bbc06..77074dc82c 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -190,16 +190,6 @@ add_library(mbgl-android STATIC platform/android/src/style/sources/image_source.cpp platform/android/src/style/sources/raster_dem_source.cpp platform/android/src/style/sources/raster_dem_source.hpp - platform/android/src/style/functions/stop.cpp - platform/android/src/style/functions/stop.hpp - platform/android/src/style/functions/categorical_stops.cpp - platform/android/src/style/functions/categorical_stops.hpp - platform/android/src/style/functions/exponential_stops.cpp - platform/android/src/style/functions/exponential_stops.hpp - platform/android/src/style/functions/identity_stops.cpp - platform/android/src/style/functions/identity_stops.hpp - platform/android/src/style/functions/interval_stops.cpp - platform/android/src/style/functions/interval_stops.hpp platform/android/src/style/position.cpp platform/android/src/style/position.hpp platform/android/src/style/light.cpp @@ -222,6 +212,8 @@ add_library(mbgl-android STATIC platform/android/src/map_renderer_runnable.hpp # Java core classes + platform/android/src/java/lang.cpp + platform/android/src/java/lang.hpp platform/android/src/java/util.cpp platform/android/src/java/util.hpp @@ -238,6 +230,8 @@ add_library(mbgl-android STATIC platform/android/src/geojson/feature_collection.hpp platform/android/src/geojson/geometry.cpp platform/android/src/geojson/geometry.hpp + platform/android/src/geojson/geometry_collection.cpp + platform/android/src/geojson/geometry_collection.hpp platform/android/src/geojson/line_string.cpp platform/android/src/geojson/line_string.hpp platform/android/src/geojson/multi_line_string.cpp |