update for compling warnings with master build from P-Previewlinaro-master

Change-Id: Ie860e412b5cb412ed1d036d8f0b0abc672a9bc5b
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

6 files changed, 14 insertions, 7 deletions

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..3658f0c
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=android-review.linaro.org
+port=29418
+project=platform/external/AndroidTerm
+defaultbranch=linaro-master
diff --git a/libtermexec/src/main/jni/process.cpp b/libtermexec/src/main/jni/process.cpp
index b38490e..845893f 100644
--- a/libtermexec/src/main/jni/process.cpp
+++ b/libtermexec/src/main/jni/process.cpp
@@ -178,13 +178,13 @@ static int create_subprocess(JNIEnv *env, const char *cmd, char *const argv[], c
 
 extern "C" {
 
-JNIEXPORT void JNICALL Java_jackpal_androidterm_TermExec_sendSignal(JNIEnv *env, jobject clazz,
+JNIEXPORT void JNICALL Java_jackpal_androidterm_TermExec_sendSignal(JNIEnv *env __unused, jobject clazz __unused,
     jint procId, jint signal)
 {
     kill(procId, signal);
 }
 
-JNIEXPORT jint JNICALL Java_jackpal_androidterm_TermExec_waitFor(JNIEnv *env, jclass clazz, jint procId) {
+JNIEXPORT jint JNICALL Java_jackpal_androidterm_TermExec_waitFor(JNIEnv *env __unused, jclass clazz __unused, jint procId) {
     int status;
     waitpid(procId, &status, 0);
     int result = 0;
@@ -194,7 +194,7 @@ JNIEXPORT jint JNICALL Java_jackpal_androidterm_TermExec_waitFor(JNIEnv *env, jc
     return result;
 }
 
-JNIEXPORT jint JNICALL Java_jackpal_androidterm_TermExec_createSubprocessInternal(JNIEnv *env, jclass clazz,
+JNIEXPORT jint JNICALL Java_jackpal_androidterm_TermExec_createSubprocessInternal(JNIEnv *env, jclass clazz __unused,
     jstring cmd, jobjectArray args, jobjectArray envVars, jint masterFd)
 {
     const jchar* str = cmd ? env->GetStringCritical(cmd, 0) : 0;
diff --git a/term/src/main/Android.mk b/term/src/main/Android.mk
index 796b397..504820c 100644
--- a/term/src/main/Android.mk
+++ b/term/src/main/Android.mk
@@ -23,6 +23,8 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under, java)
 
+#LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 22
 LOCAL_PACKAGE_NAME := AndroidTerm
 
 LOCAL_MODULE_TAGS := debug
diff --git a/term/src/main/jni/common.cpp b/term/src/main/jni/common.cpp
index 380c5c2..c8c6338 100644
--- a/term/src/main/jni/common.cpp
+++ b/term/src/main/jni/common.cpp
@@ -68,7 +68,7 @@ typedef union {
     void* venv;
 } UnionJNIEnvToVoid;
 
-jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+jint JNI_OnLoad(JavaVM* vm, void* reserved __unused) {
     UnionJNIEnvToVoid uenv;
     uenv.venv = NULL;
     jint result = -1;
diff --git a/term/src/main/jni/fileCompat.cpp b/term/src/main/jni/fileCompat.cpp
index 32ef11c..8b555c7 100644
--- a/term/src/main/jni/fileCompat.cpp
+++ b/term/src/main/jni/fileCompat.cpp
@@ -22,7 +22,7 @@
 
 #include "fileCompat.h"
 
-static jboolean testExecute(JNIEnv *env, jobject clazz, jstring jPathString)
+static jboolean testExecute(JNIEnv *env, jobject clazz __unused, jstring jPathString)
 {
     const char *pathname = NULL;
     int result;
diff --git a/term/src/main/jni/termExec.cpp b/term/src/main/jni/termExec.cpp
index e02ec29..27e08a2 100644
--- a/term/src/main/jni/termExec.cpp
+++ b/term/src/main/jni/termExec.cpp
@@ -30,7 +30,7 @@
 
 #include "termExec.h"
 
-static void android_os_Exec_setPtyWindowSize(JNIEnv *env, jobject clazz,
+static void android_os_Exec_setPtyWindowSize(JNIEnv *env, jobject clazz __unused,
     jint fd, jint row, jint col, jint xpixel, jint ypixel)
 {
     struct winsize sz;
@@ -57,7 +57,7 @@ static __inline__ int my_tcsetattr(int fd, const struct termios *s)
     return ioctl(fd, TCSETS, (void *)s);
 }
 
-static void android_os_Exec_setPtyUTF8Mode(JNIEnv *env, jobject clazz, jint fd, jboolean utf8Mode)
+static void android_os_Exec_setPtyUTF8Mode(JNIEnv *env, jobject clazz __unused, jint fd, jboolean utf8Mode)
 {
     struct termios tios;