diff options
12 files changed, 26 insertions, 16 deletions
diff --git a/cmds/hid/jni/Android.mk b/cmds/hid/jni/Android.mk index 8163a9d764ff..d41d39d27f5b 100644 --- a/cmds/hid/jni/Android.mk +++ b/cmds/hid/jni/Android.mk @@ -18,6 +18,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libhidcommand_jni LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -Wall +LOCAL_CFLAGS += -Wall -Wextra -Werror include $(BUILD_SHARED_LIBRARY) diff --git a/cmds/hid/jni/com_android_commands_hid_Device.cpp b/cmds/hid/jni/com_android_commands_hid_Device.cpp index 4278e7d3ac12..1ea33ced7bbf 100644 --- a/cmds/hid/jni/com_android_commands_hid_Device.cpp +++ b/cmds/hid/jni/com_android_commands_hid_Device.cpp @@ -49,7 +49,7 @@ static struct { jmethodID onDeviceError; } gDeviceCallbackClassInfo; -static int handleLooperEvents(int fd, int events, void* data) { +static int handleLooperEvents(int /* fd */, int events, void* data) { Device* d = reinterpret_cast<Device*>(data); return d->handleEvents(events); } @@ -183,7 +183,7 @@ std::unique_ptr<uint8_t[]> getData(JNIEnv* env, jbyteArray javaArray, size_t& ou return data; } -static jlong openDevice(JNIEnv* env, jclass clazz, jstring rawName, jint id, jint vid, jint pid, +static jlong openDevice(JNIEnv* env, jclass /* clazz */, jstring rawName, jint id, jint vid, jint pid, jbyteArray rawDescriptor, jobject queue, jobject callback) { ScopedUtfChars name(env, rawName); if (name.c_str() == nullptr) { @@ -202,7 +202,7 @@ static jlong openDevice(JNIEnv* env, jclass clazz, jstring rawName, jint id, jin return reinterpret_cast<jlong>(d); } -static void sendReport(JNIEnv* env, jclass clazz, jlong ptr,jbyteArray rawReport) { +static void sendReport(JNIEnv* env, jclass /* clazz */, jlong ptr,jbyteArray rawReport) { size_t size; std::unique_ptr<uint8_t[]> report = getData(env, rawReport, size); uhid::Device* d = reinterpret_cast<uhid::Device*>(ptr); @@ -211,7 +211,7 @@ static void sendReport(JNIEnv* env, jclass clazz, jlong ptr,jbyteArray rawReport } } -static void closeDevice(JNIEnv* env, jclass clazz, jlong ptr) { +static void closeDevice(JNIEnv* /* env */, jclass /* clazz */, jlong ptr) { uhid::Device* d = reinterpret_cast<uhid::Device*>(ptr); if (d) { delete d; diff --git a/core/tests/coretests/apks/install_jni_lib/Android.mk b/core/tests/coretests/apks/install_jni_lib/Android.mk index 7322e8d6949b..9e45d099b669 100644 --- a/core/tests/coretests/apks/install_jni_lib/Android.mk +++ b/core/tests/coretests/apks/install_jni_lib/Android.mk @@ -22,6 +22,8 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ libnativehelper +LOCAL_CFLAGS += -Wall -Werror + LOCAL_MODULE := libframeworks_coretests_jni # this does not prevent build system diff --git a/core/tests/coretests/apks/install_jni_lib/com_android_frameworks_coretests_JNITest.cpp b/core/tests/coretests/apks/install_jni_lib/com_android_frameworks_coretests_JNITest.cpp index 3e8301038359..8d9119275bc8 100644 --- a/core/tests/coretests/apks/install_jni_lib/com_android_frameworks_coretests_JNITest.cpp +++ b/core/tests/coretests/apks/install_jni_lib/com_android_frameworks_coretests_JNITest.cpp @@ -37,7 +37,7 @@ int register_com_android_frameworks_coretests_JNITests(JNIEnv* env) { /* * JNI Initialization */ -jint JNI_OnLoad(JavaVM *jvm, void *reserved) { +jint JNI_OnLoad(JavaVM *jvm, void */* reserved */) { JNIEnv *e; int status; diff --git a/core/tests/hosttests/test-apps/SharedUid/32/jni/Android.mk b/core/tests/hosttests/test-apps/SharedUid/32/jni/Android.mk index ff5a5359af12..994131a22ab3 100644 --- a/core/tests/hosttests/test-apps/SharedUid/32/jni/Android.mk +++ b/core/tests/hosttests/test-apps/SharedUid/32/jni/Android.mk @@ -32,6 +32,8 @@ LOCAL_SRC_FILES:= \ # All of the shard libraries we link against. LOCAL_SHARED_LIBRARIES := liblog +LOCAL_CFLAGS += -Wall -Wextra -Werror + # Also need the JNI headers. LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) diff --git a/core/tests/hosttests/test-apps/SharedUid/32/jni/native.cpp b/core/tests/hosttests/test-apps/SharedUid/32/jni/native.cpp index 67b12d775828..99cf587af2a6 100644 --- a/core/tests/hosttests/test-apps/SharedUid/32/jni/native.cpp +++ b/core/tests/hosttests/test-apps/SharedUid/32/jni/native.cpp @@ -22,7 +22,7 @@ #include "jni.h" static jint -add(JNIEnv *env, jobject thiz, jint a, jint b) { +add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) { int result = a + b; ALOGI("%d + %d = %d", a, b, result); return result; @@ -82,7 +82,7 @@ typedef union { void* venv; } UnionJNIEnvToVoid; -jint JNI_OnLoad(JavaVM* vm, void* reserved) +jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) { UnionJNIEnvToVoid uenv; uenv.venv = NULL; diff --git a/core/tests/hosttests/test-apps/SharedUid/64/jni/Android.mk b/core/tests/hosttests/test-apps/SharedUid/64/jni/Android.mk index abb1d9f6ca9f..6c2679b30bfb 100644 --- a/core/tests/hosttests/test-apps/SharedUid/64/jni/Android.mk +++ b/core/tests/hosttests/test-apps/SharedUid/64/jni/Android.mk @@ -34,6 +34,8 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libutils liblog +LOCAL_CFLAGS += -Wall -Wextra -Werror + # Also need the JNI headers. LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) diff --git a/core/tests/hosttests/test-apps/SharedUid/64/jni/native.cpp b/core/tests/hosttests/test-apps/SharedUid/64/jni/native.cpp index 342b3bc0ac9a..0b6d7501dcae 100644 --- a/core/tests/hosttests/test-apps/SharedUid/64/jni/native.cpp +++ b/core/tests/hosttests/test-apps/SharedUid/64/jni/native.cpp @@ -22,7 +22,7 @@ #include "jni.h" static jint -add(JNIEnv *env, jobject thiz, jint a, jint b) { +add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) { int result = a + b; ALOGI("%d + %d = %d", a, b, result); return result; @@ -82,7 +82,7 @@ typedef union { void* venv; } UnionJNIEnvToVoid; -jint JNI_OnLoad(JavaVM* vm, void* reserved) +jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) { UnionJNIEnvToVoid uenv; uenv.venv = NULL; diff --git a/core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.mk b/core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.mk index ae8e636caf4b..d668f29456c8 100644 --- a/core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.mk +++ b/core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.mk @@ -33,6 +33,8 @@ LOCAL_SRC_FILES:= \ LOCAL_LDLIBS = -llog LOCAL_SHARED_LIBRARIES := liblog +LOCAL_CFLAGS += -Wall -Wextra -Werror + # Also need the JNI headers. LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) diff --git a/core/tests/hosttests/test-apps/SharedUid/dual/jni/native.cpp b/core/tests/hosttests/test-apps/SharedUid/dual/jni/native.cpp index 9b38e3e4c437..3947e21a77bd 100644 --- a/core/tests/hosttests/test-apps/SharedUid/dual/jni/native.cpp +++ b/core/tests/hosttests/test-apps/SharedUid/dual/jni/native.cpp @@ -22,7 +22,7 @@ #include "jni.h" static jint -add(JNIEnv *env, jobject thiz, jint a, jint b) { +add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) { int result = a + b; ALOGI("%d + %d = %d", a, b, result); return result; @@ -82,7 +82,7 @@ typedef union { void* venv; } UnionJNIEnvToVoid; -jint JNI_OnLoad(JavaVM* vm, void* reserved) +jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) { UnionJNIEnvToVoid uenv; uenv.venv = NULL; diff --git a/tests/touchlag/Android.mk b/tests/touchlag/Android.mk index 4f8aa1e60ca8..70b198917547 100644 --- a/tests/touchlag/Android.mk +++ b/tests/touchlag/Android.mk @@ -9,6 +9,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test-touchlag +LOCAL_CFLAGS += -Wall -Wextra -Werror + LOCAL_MODULE_TAGS := tests include $(BUILD_EXECUTABLE) diff --git a/tests/touchlag/touchlag.cpp b/tests/touchlag/touchlag.cpp index df4befb95fb9..9264a254ed24 100644 --- a/tests/touchlag/touchlag.cpp +++ b/tests/touchlag/touchlag.cpp @@ -54,11 +54,11 @@ void clearBuffer(Buffer* buf, uint32_t pixel) { void drawTwoPixels(Buffer* buf, uint32_t pixel, ssize_t x, ssize_t y, size_t w) { if (y>0 && y<ssize_t(buf->h)) { uint32_t* bits = buf->pixels + y * buf->s; - if (x>=0 && x<buf->w) { + if (x>=0 && x<ssize_t(buf->w)) { bits[x] = pixel; } ssize_t W(w); - if ((x+W)>=0 && (x+W)<buf->w) { + if ((x+W)>=0 && (x+W)<ssize_t(buf->w)) { bits[x+W] = pixel; } } @@ -251,13 +251,13 @@ int main(int argc, char** argv) { Queue queue; - int x=0, y=0, down=0; + int x=0, y=0; int lag_x=0, lag_y=0; clearBuffer(&framebuffer, 0); while (true) { uint32_t crt = 0; - int err = ioctl(fd, FBIO_WAITFORVSYNC, &crt); + ioctl(fd, FBIO_WAITFORVSYNC, &crt); // draw beam marker drawRect(&framebuffer, 0x400000, framebuffer.w-2, 0, 2, framebuffer.h); |