1 files changed, 17 insertions, 0 deletions
diff --git a/platform/default/jni/string_conversion.hpp b/platform/default/jni/string_conversion.hpp
new file mode 100644
index 0000000000..66df539f4e
--- /dev/null
+++ b/platform/default/jni/string_conversion.hpp
@@ -0,0 +1,17 @@
+#pragma once
+
+// This file replaces the default implementation in jni.hpp.
+
+#include <mbgl/util/utf.hpp>
+
+namespace jni {
+
+inline std::u16string convertUTF8ToUTF16(const std::string& str) {
+    return mbgl::util::convertUTF8ToUTF16(str);
+}
+
+inline std::string convertUTF16ToUTF8(const std::u16string& str) {
+    return mbgl::util::convertUTF16ToUTF8(str);
+}
+
+} // namespace jni