Merge "Fixed a few warnings and disabled abort on lint."

Author: johnb003

README.md

@@ -149,9 +149,11 @@ The steps are:
 
 
 ## Building the Plugin
-To build the plugin run `./gradlew build_all`. This builds the support aar
-library, and packages the plugin into a .unitypackage file.  It also packages the
-sample scene and script in a separate package.
+To build the plugin run `./gradlew -PlintAbortOnError build_all`. This builds the support aar
+library with lint warnings as errors and packages the plugin into a .unitypackage file.  It
+also packages the sample scene and script in a separate package.
+
+There's also a shortcut for linux/mac: `./build_all`.
 
 
 ## Questions? Problems?

build_all.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+readonly THIS_DIR="$(cd "$(dirname "$0")"; pwd)"
+pushd ${THIS_DIR}
+./gradlew -PlintAbortOnError="true" build_all
+popd

native-googlesignin/build.gradle

@@ -33,7 +33,7 @@ project.ext.baseName = "google-signin-support"
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "25.0.3"
+    buildToolsVersion "26.0.3"
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 26
@@ -48,6 +48,11 @@ android {
             abiFilters 'x86', 'armeabi-v7a'
         }
     }
+    lintOptions {
+        abortOnError (project.hasProperty("lintAbortOnError") &&
+                      (project.lintAbortOnError == "" ||
+                       project.lintAbortOnError.toBoolean()))
+    }
     buildTypes {
         release {
             minifyEnabled false

native-googlesignin/src/main/cpp/google_signin.cc

@@ -139,10 +139,12 @@ class GoogleSignIn::GoogleSignInImpl {
 };
 
 const JNINativeMethod GoogleSignIn::GoogleSignInImpl::methods[] = {
+  {
     NATIVEONRESULT_METHOD_NAME,
     NATIVEONRESULT_METHOD_SIG,
     reinterpret_cast<void *>(
         GoogleSignIn::GoogleSignInImpl::NativeOnAuthResult),
+  },
 };
 
 jclass GoogleSignIn::GoogleSignInImpl::helper_clazz_ = 0;

native-googlesignin/src/main/cpp/google_signin_bridge.h

@@ -20,6 +20,7 @@
 // primarily by the Unity plugin.
 
 #include <jni.h>
+#include <stddef.h>
 
 struct GoogleSignInHolder;
 typedef GoogleSignInHolder* GoogleSignIn_t;

native-googlesignin/src/main/cpp/google_signin_user.cc

@@ -101,7 +101,7 @@ void GoogleSignInUserImpl::Initialize(jobject obj) {
 
     jclass uri_class = FindClass(URI_NAME, obj);
     method_uri_toString = env->GetMethodID(
-        google_acct_class, TOSTRING_METHOD_NAME, TOSTRING_METHOD_SIG);
+        uri_class, TOSTRING_METHOD_NAME, TOSTRING_METHOD_SIG);
 
     method_getServerAuthCode =
         env->GetMethodID(google_acct_class, GETSERVERAUTHCODE_METHOD_NAME,