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

# Conflicts:
#	cmake/mason-dependencies.cmake

1 files changed, 5 insertions, 12 deletions

diff --git a/platform/android/src/java/util.cpp b/platform/android/src/java/util.cpp
index 89c4c77794..b3aebb36cc 100644
--- a/platform/android/src/java/util.cpp
+++ b/platform/android/src/java/util.cpp
@@ -5,21 +5,14 @@ namespace android {
 namespace java {
 namespace util {
 
-jni::Class<Arrays> Arrays::javaClass;
-jni::Class<List> List::javaClass;
-jni::Class<Set> Set::javaClass;
-jni::Class<Map> Map::javaClass;
-jni::Class<Map::Entry> Map::Entry::javaClass;
-
 void registerNative(jni::JNIEnv& env) {
-    Arrays::javaClass = *jni::Class<Arrays>::Find(env).NewGlobalRef(env).release();
-    List::javaClass = *jni::Class<List>::Find(env).NewGlobalRef(env).release();
-    Set::javaClass = *jni::Class<Set>::Find(env).NewGlobalRef(env).release();
-    Map::javaClass = *jni::Class<Map>::Find(env).NewGlobalRef(env).release();
-    Map::Entry::javaClass = *jni::Class<Map::Entry>::Find(env).NewGlobalRef(env).release();
+    jni::Class<Arrays>::Singleton(env);
+    jni::Class<List>::Singleton(env);
+    jni::Class<Set>::Singleton(env);
+    jni::Class<Map>::Singleton(env);
+    jni::Class<Map::Entry>::Singleton(env);
 }
 
-
 } // namespace util
 } // namespace java
 } // namespace android