[build] Use jni.hpp from mapbox-base

4 files changed, 27 insertions, 39 deletions

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",