Merge remote-tracking branch 'origin' into bwg-vs2017upstream/bwg-vs2017

# Conflicts:
#	cmake/mason-dependencies.cmake

1 files changed, 5 insertions, 8 deletions

diff --git a/platform/android/src/geometry/projected_meters.cpp b/platform/android/src/geometry/projected_meters.cpp
index f3d9d1b0ef..e079de0062 100644
--- a/platform/android/src/geometry/projected_meters.cpp
+++ b/platform/android/src/geometry/projected_meters.cpp
@@ -3,18 +3,15 @@
 namespace mbgl {
 namespace android {
 
-jni::Object<ProjectedMeters> ProjectedMeters::New(jni::JNIEnv& env, double northing, double easting) {
-    static auto constructor = ProjectedMeters::javaClass.GetConstructor<double, double>(env);
-    return ProjectedMeters::javaClass.New(env, constructor, northing, easting);
+jni::Local<jni::Object<ProjectedMeters>> ProjectedMeters::New(jni::JNIEnv& env, double northing, double easting) {
+    static auto& javaClass = jni::Class<ProjectedMeters>::Singleton(env);
+    static auto constructor = javaClass.GetConstructor<double, double>(env);
+    return javaClass.New(env, constructor, northing, easting);
 }
 
 void ProjectedMeters::registerNative(jni::JNIEnv& env) {
-    // Lookup the class
-    ProjectedMeters::javaClass = *jni::Class<ProjectedMeters>::Find(env).NewGlobalRef(env).release();
+    jni::Class<ProjectedMeters>::Singleton(env);
 }
 
-jni::Class<ProjectedMeters> ProjectedMeters::javaClass;
-
-
 } // namespace android
 } // namespace mbgl
\ No newline at end of file