[build] Use jni.hpp from mapbox-base

9 files changed, 32 insertions, 49 deletions

diff --git a/.gitmodules b/.gitmodules
index 76b365f5d7..1c6add6472 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index 3b7976c500..79a90965f3 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -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)
diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK
index fc99edc78b..50acc27046 100644
--- a/misc/buck/mapbox-gl-native/BUCK
+++ b/misc/buck/mapbox-gl-native/BUCK
@@ -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")
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index 4bd628fcdd..98d18ca324 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -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
diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js
index 157596b542..0be0aa5dd9 100755
--- a/scripts/generate-file-lists.js
+++ b/scripts/generate-file-lists.js
@@ -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" ]);
diff --git a/vendor/jni.hpp b/vendor/jni.hpp
deleted file mode 160000
-Subproject 8f55acd9017452f45a88ab3fb3aef89de995b72
diff --git a/vendor/jni.hpp-files.json b/vendor/jni.hpp-files.json
deleted file mode 100644
index f4d93abc74..0000000000
--- a/vendor/jni.hpp-files.json
+++ /dev/null
@@ -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": {}
-}
diff --git a/vendor/jni.hpp.cmake b/vendor/jni.hpp.cmake
deleted file mode 100644
index bf3c129858..0000000000
--- a/vendor/jni.hpp.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-add_library(jni.hpp INTERFACE)
-
-target_include_directories(jni.hpp SYSTEM INTERFACE
-    ${CMAKE_SOURCE_DIR}/vendor/jni.hpp/include
-)
diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json
index 1f27640540..816f3af818 100644
--- a/vendor/mapbox-base-files.json
+++ b/vendor/mapbox-base-files.json
@@ -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",