tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Use jni.hpp from mapbox-base

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-08-30 14:50:11 +03:00
parent 0edc50561f
commit 4af4081fcf
9 changed files with 32 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -52,9 +52,6 @@
[submodule "vendor/pixelmatch-cpp"]
path = vendor/pixelmatch-cpp
url = https://github.com/mapbox/pixelmatch-cpp.git
[submodule "vendor/jni.hpp"]
path = vendor/jni.hpp
url = https://github.com/mapbox/jni.hpp.git
[submodule "vendor/glfw"]
path = vendor/glfw
url = https://github.com/glfw/glfw.git

1
cmake/vendor.cmake
View File

@@ -13,7 +13,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/filesystem.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/googletest.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/pixelmatch-cpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake)

1
misc/buck/mapbox-gl-native/BUCK
View File

@@ -44,7 +44,6 @@ mbgl_vendor_library("earcut.hpp")
mbgl_vendor_library("expected")
mbgl_vendor_library("eternal")
mbgl_vendor_library("geojson-vt-cpp")
mbgl_vendor_library("jni.hpp")
mbgl_vendor_library("mapbox-base")
mbgl_vendor_library("sqlite")
mbgl_vendor_library("pixelmatch-cpp")

4
platform/android/config.cmake
View File

@@ -43,7 +43,7 @@ macro(mbgl_platform_core)
)
target_link_libraries(mbgl-core
PUBLIC jni.hpp
PUBLIC Mapbox::Base::jni.hpp
PUBLIC -llog
PUBLIC -landroid
PUBLIC -ljnigraphics
@@ -61,7 +61,7 @@ macro(mbgl_filesource)
target_link_libraries(mbgl-filesource
PUBLIC sqlite
PUBLIC jni.hpp
PUBLIC Mapbox::Base::jni.hpp
PUBLIC -llog
PUBLIC -landroid
PUBLIC -latomic

6
scripts/generate-file-lists.js
View File

@@ -135,15 +135,15 @@ generateFileList('vendor/expected-files.json', [ 'vendor/expected' ], vendorRege
generateFileList('vendor/filesystem-files.json', [ 'vendor/filesystem' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/geojson-vt-cpp-files.json', [ 'vendor/geojson-vt-cpp' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/icu-files.json', [ 'vendor/icu' ], vendorRegex, [ "include/**/*.h", "src/*.h", "src/*.cpp" ]);
generateFileList('vendor/jni.hpp-files.json', [ 'vendor/jni.hpp' ], vendorRegex, [ "include/**/*.hpp", ":!:include/jni/string_conversion.hpp" ]);
generateFileList('vendor/mapbox-base-files.json',
[ 'vendor/mapbox-base/extras/kdbush.hpp',
'vendor/mapbox-base/mapbox/geometry.hpp',
'vendor/mapbox-base/mapbox/variant',
'vendor/mapbox-base/mapbox/optional',
'vendor/mapbox-base/mapbox/supercluster.hpp',
'vendor/mapbox-base/mapbox/geojson.hpp' ],
vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "optional.hpp" ]);
'vendor/mapbox-base/mapbox/geojson.hpp',
'vendor/mapbox-base/mapbox/jni.hpp' ],
vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "optional.hpp", ":!:include/jni/string_conversion.hpp" ]);
generateFileList('vendor/pixelmatch-cpp-files.json', [ 'vendor/pixelmatch-cpp' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/polylabel-files.json', [ 'vendor/polylabel' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/protozero-files.json', [ 'vendor/protozero' ], vendorRegex, [ "include/**/*.hpp" ]);

1
vendor/jni.hpp vendored

Submodule vendor/jni.hpp deleted from 8f55acd901

34
vendor/jni.hpp-files.json vendored
View File

@@ -1,34 +0,0 @@
{
"//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js",
"sources": [],
"public_headers": {
"jni/advanced_ownership.hpp": "vendor/jni.hpp/include/jni/advanced_ownership.hpp",
"jni/array.hpp": "vendor/jni.hpp/include/jni/array.hpp",
"jni/arraylike.hpp": "vendor/jni.hpp/include/jni/arraylike.hpp",
"jni/boxing.hpp": "vendor/jni.hpp/include/jni/boxing.hpp",
"jni/class.hpp": "vendor/jni.hpp/include/jni/class.hpp",
"jni/constructor.hpp": "vendor/jni.hpp/include/jni/constructor.hpp",
"jni/errors.hpp": "vendor/jni.hpp/include/jni/errors.hpp",
"jni/field.hpp": "vendor/jni.hpp/include/jni/field.hpp",
"jni/functions.hpp": "vendor/jni.hpp/include/jni/functions.hpp",
"jni/jni.hpp": "vendor/jni.hpp/include/jni/jni.hpp",
"jni/make.hpp": "vendor/jni.hpp/include/jni/make.hpp",
"jni/method.hpp": "vendor/jni.hpp/include/jni/method.hpp",
"jni/native_method.hpp": "vendor/jni.hpp/include/jni/native_method.hpp",
"jni/npe.hpp": "vendor/jni.hpp/include/jni/npe.hpp",
"jni/object.hpp": "vendor/jni.hpp/include/jni/object.hpp",
"jni/ownership.hpp": "vendor/jni.hpp/include/jni/ownership.hpp",
"jni/static_field.hpp": "vendor/jni.hpp/include/jni/static_field.hpp",
"jni/static_method.hpp": "vendor/jni.hpp/include/jni/static_method.hpp",
"jni/string.hpp": "vendor/jni.hpp/include/jni/string.hpp",
"jni/tagging.hpp": "vendor/jni.hpp/include/jni/tagging.hpp",
"jni/traits.hpp": "vendor/jni.hpp/include/jni/traits.hpp",
"jni/type_signature.hpp": "vendor/jni.hpp/include/jni/type_signature.hpp",
"jni/typed_methods.hpp": "vendor/jni.hpp/include/jni/typed_methods.hpp",
"jni/types.hpp": "vendor/jni.hpp/include/jni/types.hpp",
"jni/unique.hpp": "vendor/jni.hpp/include/jni/unique.hpp",
"jni/weak_reference.hpp": "vendor/jni.hpp/include/jni/weak_reference.hpp",
"jni/wrapping.hpp": "vendor/jni.hpp/include/jni/wrapping.hpp"
},
"private_headers": {}
}

5
vendor/jni.hpp.cmake vendored
View File

@@ -1,5 +0,0 @@
add_library(jni.hpp INTERFACE)
target_include_directories(jni.hpp SYSTEM INTERFACE
${CMAKE_SOURCE_DIR}/vendor/jni.hpp/include
)

27
vendor/mapbox-base-files.json vendored
View File

@@ -21,6 +21,33 @@
"mapbox/geometry/point_arithmetic.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp",
"mapbox/geometry/polygon.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/polygon.hpp",
"mapbox/geometry_io.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry_io.hpp",
"jni/advanced_ownership.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/advanced_ownership.hpp",
"jni/array.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/array.hpp",
"jni/arraylike.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/arraylike.hpp",
"jni/boxing.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/boxing.hpp",
"jni/class.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/class.hpp",
"jni/constructor.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/constructor.hpp",
"jni/errors.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/errors.hpp",
"jni/field.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/field.hpp",
"jni/functions.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/functions.hpp",
"jni/jni.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/jni.hpp",
"jni/make.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/make.hpp",
"jni/method.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/method.hpp",
"jni/native_method.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/native_method.hpp",
"jni/npe.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/npe.hpp",
"jni/object.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/object.hpp",
"jni/ownership.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/ownership.hpp",
"jni/static_field.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/static_field.hpp",
"jni/static_method.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/static_method.hpp",
"jni/string.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/string.hpp",
"jni/tagging.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/tagging.hpp",
"jni/traits.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/traits.hpp",
"jni/type_signature.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/type_signature.hpp",
"jni/typed_methods.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/typed_methods.hpp",
"jni/types.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/types.hpp",
"jni/unique.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/unique.hpp",
"jni/weak_reference.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/weak_reference.hpp",
"jni/wrapping.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/wrapping.hpp",
"optional.hpp": "vendor/mapbox-base/mapbox/optional/optional.hpp",
"supercluster.hpp": "vendor/mapbox-base/mapbox/supercluster.hpp/include/supercluster.hpp",
"mapbox/optional.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/optional.hpp",