Merge pull request #19 from graeme-hill/android-mem-leak

Android mem leak

Guid.cpp

@@ -350,23 +350,26 @@ Guid newGuid()
 
 	std::array<unsigned char, 16> bytes =
 	{
-		(mostSignificant >> 56) & 0xFF,
-		(mostSignificant >> 48) & 0xFF,
-		(mostSignificant >> 40) & 0xFF,
-		(mostSignificant >> 32) & 0xFF,
-		(mostSignificant >> 24) & 0xFF,
-		(mostSignificant >> 16) & 0xFF,
-		(mostSignificant >> 8) & 0xFF,
-		(mostSignificant) & 0xFF,
-		(leastSignificant >> 56) & 0xFF,
-		(leastSignificant >> 48) & 0xFF,
-		(leastSignificant >> 40) & 0xFF,
-		(leastSignificant >> 32) & 0xFF,
-		(leastSignificant >> 24) & 0xFF,
-		(leastSignificant >> 16) & 0xFF,
-		(leastSignificant >> 8) & 0xFF,
-		(leastSignificant) & 0xFF,
+		(unsigned char)((mostSignificant >> 56) & 0xFF),
+		(unsigned char)((mostSignificant >> 48) & 0xFF),
+		(unsigned char)((mostSignificant >> 40) & 0xFF),
+		(unsigned char)((mostSignificant >> 32) & 0xFF),
+		(unsigned char)((mostSignificant >> 24) & 0xFF),
+		(unsigned char)((mostSignificant >> 16) & 0xFF),
+		(unsigned char)((mostSignificant >> 8) & 0xFF),
+		(unsigned char)((mostSignificant) & 0xFF),
+		(unsigned char)((leastSignificant >> 56) & 0xFF),
+		(unsigned char)((leastSignificant >> 48) & 0xFF),
+		(unsigned char)((leastSignificant >> 40) & 0xFF),
+		(unsigned char)((leastSignificant >> 32) & 0xFF),
+		(unsigned char)((leastSignificant >> 24) & 0xFF),
+		(unsigned char)((leastSignificant >> 16) & 0xFF),
+		(unsigned char)((leastSignificant >> 8) & 0xFF),
+		(unsigned char)((leastSignificant) & 0xFF)
 	};
+
+	androidInfo.env->DeleteLocalRef(javaUuid);
+
 	return bytes;
 }
 #endif

Guid.hpp

@@ -24,6 +24,10 @@ THE SOFTWARE.
 
 #pragma once
 
+#ifdef GUID_ANDROID
+#include <jni.h>
+#endif
+
 #include <functional>
 #include <iostream>
 #include <array>
@@ -32,10 +36,6 @@ THE SOFTWARE.
 #include <utility>
 #include <iomanip>
 
-#ifdef GUID_ANDROID
-#include <jni.h>
-#endif
-
 #define BEGIN_XG_NAMESPACE namespace xg {
 #define END_XG_NAMESPACE }
 

android/jni/Android.mk

@@ -6,6 +6,7 @@ LOCAL_MODULE := crossguidtest
 LOCAL_CFLAGS := -Wall
 LOCAL_SRC_FILES := ../../Guid.cpp ../../test/Test.cpp jnitest.cpp
 LOCAL_CPP_FLAGS := -std=c++14
-LOCAL_CPPFLAGS := -DGUID_ANDROID -Wno-c++11-extensions
+LOCAL_CPPFLAGS := -DGUID_ANDROID -Wno-c++11-extensions -Wno-missing-braces
+LOCAL_LDLIBS := -latomic
 
 include $(BUILD_SHARED_LIBRARY)

android/jni/Application.mk

@@ -1,4 +1,4 @@
-APP_STL := stlport_static
+APP_STL := c++_static
 NDK_TOOLCHAIN_VERSION := clang
 LOCAL_CPP_FLAGS := -DGUID_ANDROID
 APP_ABI := all

test/TestMain.cpp

@@ -3,5 +3,5 @@
 
 int main()
 {
-  return test(std::cout);
+	return test(std::cout);
 }