diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-08-03 12:27:12 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | da37ba1822c55de4d3c94b6e206b59b0b023264e (patch) | |
| tree | df42830183bb313781762f79d91286d7969506aa | |
| parent | 131cd8a547dcffc81c39568efcd70aa190f16062 (diff) | |
| download | qtlocation-mapboxgl-da37ba1822c55de4d3c94b6e206b59b0b023264e.tar.gz | |
[build] add missing files to Android build
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | platform/android/build.gradle | 1 | ||||
| -rw-r--r-- | platform/android/config.cmake | 40 |
3 files changed, 41 insertions, 4 deletions
@@ -425,7 +425,7 @@ build/android-$1/$(BUILDTYPE)/toolchain.cmake: platform/android/scripts/toolchai $(ANDROID_ENV) $1 > build/android-$1/$(BUILDTYPE)/toolchain.cmake build/android-$1/$(BUILDTYPE)/Makefile: build/android-$1/$(BUILDTYPE)/toolchain.cmake platform/android/config.cmake - cd build/android-$1/$(BUILDTYPE) && cmake ../../.. \ + cd build/android-$1/$(BUILDTYPE) && cmake ../../.. -G Ninja \ -DCMAKE_TOOLCHAIN_FILE=build/android-$1/$(BUILDTYPE)/toolchain.cmake \ -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ @@ -433,7 +433,7 @@ build/android-$1/$(BUILDTYPE)/Makefile: build/android-$1/$(BUILDTYPE)/toolchain. .PHONY: android-lib-$1 android-lib-$1: build/android-$1/$(BUILDTYPE)/Makefile - $(MAKE) -j$(JOBS) -C build/android-$1/$(BUILDTYPE) all + $(NINJA) -j$(JOBS) -C build/android-$1/$(BUILDTYPE) all .PHONY: android-$1 android-$1: android-lib-$1 diff --git a/platform/android/build.gradle b/platform/android/build.gradle index c99fc67a61..422575298b 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -1,5 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -// Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { diff --git a/platform/android/config.cmake b/platform/android/config.cmake index aa1cec2072..af9ea99455 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -15,6 +15,7 @@ macro(mbgl_platform_core) PRIVATE platform/android/src/thread.cpp PRIVATE platform/android/src/async_task.cpp PRIVATE platform/android/src/run_loop.cpp + PRIVATE platform/android/src/run_loop_impl.hpp PRIVATE platform/android/src/timer.cpp # File source @@ -34,10 +35,41 @@ macro(mbgl_platform_core) PRIVATE platform/default/sqlite3.hpp # Misc - PRIVATE platform/android/src/native_map_view.cpp PRIVATE platform/android/src/log_android.cpp PRIVATE platform/default/string_stdlib.cpp + # Conversion + PRIVATE platform/android/src/conversion/constant.hpp + PRIVATE platform/android/src/conversion/conversion.hpp + PRIVATE platform/android/src/style/conversion/function.hpp + PRIVATE platform/android/src/style/conversion/property_value.hpp + PRIVATE platform/android/src/style/conversion/types.hpp + PRIVATE platform/android/src/style/conversion/types_string_values.hpp + + # Style + PRIVATE platform/android/src/style/value.cpp + PRIVATE platform/android/src/style/value.hpp + PRIVATE platform/android/src/style/layers/background_layer.cpp + PRIVATE platform/android/src/style/layers/background_layer.hpp + PRIVATE platform/android/src/style/layers/circle_layer.cpp + PRIVATE platform/android/src/style/layers/circle_layer.hpp + PRIVATE platform/android/src/style/layers/custom_layer.cpp + PRIVATE platform/android/src/style/layers/custom_layer.hpp + PRIVATE platform/android/src/style/layers/fill_layer.cpp + PRIVATE platform/android/src/style/layers/fill_layer.hpp + PRIVATE platform/android/src/style/layers/layer.cpp + PRIVATE platform/android/src/style/layers/layer.hpp + PRIVATE platform/android/src/style/layers/layers.cpp + PRIVATE platform/android/src/style/layers/layers.hpp + PRIVATE platform/android/src/style/layers/line_layer.cpp + PRIVATE platform/android/src/style/layers/line_layer.hpp + PRIVATE platform/android/src/style/layers/raster_layer.cpp + PRIVATE platform/android/src/style/layers/raster_layer.hpp + PRIVATE platform/android/src/style/layers/symbol_layer.cpp + PRIVATE platform/android/src/style/layers/symbol_layer.hpp + PRIVATE platform/android/src/style/sources/sources.cpp + PRIVATE platform/android/src/style/sources/sources.hpp + # Image handling PRIVATE platform/default/image.cpp PRIVATE platform/default/png_reader.cpp @@ -71,8 +103,14 @@ macro(mbgl_platform_core) endmacro() add_library(mapbox-gl SHARED + platform/android/src/native_map_view.cpp + platform/android/src/native_map_view.hpp platform/android/src/jni.cpp + platform/android/src/jni.hpp platform/android/src/attach_env.cpp + platform/android/src/attach_env.hpp + platform/android/src/java_types.cpp + platform/android/src/java_types.hpp ) target_link_libraries(mapbox-gl |