diff options
7 files changed, 13 insertions, 9 deletions
diff --git a/packages/DefaultContainerService/jni/Android.mk b/packages/DefaultContainerService/jni/Android.mk index ef4f6995011d..7808ae15336b 100644 --- a/packages/DefaultContainerService/jni/Android.mk +++ b/packages/DefaultContainerService/jni/Android.mk @@ -18,8 +18,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) - - LOCAL_SRC_FILES := \ com_android_defcontainer_MeasurementUtils.cpp @@ -37,4 +35,6 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE := libdefcontainer_jni LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code + include $(BUILD_SHARED_LIBRARY) diff --git a/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp index 7390bb705b9d..6be48491ef10 100644 --- a/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp +++ b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp @@ -29,7 +29,7 @@ namespace android { -static jlong native_measureDirectory(JNIEnv* env, jobject clazz, jstring directory) { +static jlong native_measureDirectory(JNIEnv* env, jobject /* clazz */, jstring directory) { jlong ret = 0L; const char* path = env->GetStringUTFChars(directory, NULL); @@ -65,7 +65,7 @@ int register_com_android_defcontainer(JNIEnv *env) { } // namespace android -int JNI_OnLoad(JavaVM *jvm, void* reserved) { +int JNI_OnLoad(JavaVM *jvm, void* /* reserved */) { JNIEnv *env; if (jvm->GetEnv((void**)&env, JNI_VERSION_1_6)) { diff --git a/packages/PrintSpooler/jni/Android.mk b/packages/PrintSpooler/jni/Android.mk index fe7d06b4c661..9fd4c84203c7 100644 --- a/packages/PrintSpooler/jni/Android.mk +++ b/packages/PrintSpooler/jni/Android.mk @@ -16,4 +16,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libprintspooler_jni LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code + include $(BUILD_SHARED_LIBRARY) diff --git a/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp b/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp index 57281c8a0b05..b5d91385abe5 100644 --- a/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp +++ b/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp @@ -79,7 +79,7 @@ static void throwIllegalArgumentException(JNIEnv* env, char* message) { throwException(env, className, message); } -static void readBitmapPixels(JNIEnv* env, jclass clazz, jobject jbitmap, jint fd) { +static void readBitmapPixels(JNIEnv* env, jclass /* clazz */, jobject jbitmap, jint fd) { // Read the info. AndroidBitmapInfo readInfo; bool read = readAllBytes(fd, (void*) &readInfo, sizeof(AndroidBitmapInfo)); @@ -127,7 +127,7 @@ static void readBitmapPixels(JNIEnv* env, jclass clazz, jobject jbitmap, jint fd } } -static void writeBitmapPixels(JNIEnv* env, jclass clazz, jobject jbitmap, jint fd) { +static void writeBitmapPixels(JNIEnv* env, jclass /* clazz */, jobject jbitmap, jint fd) { // Get the info. AndroidBitmapInfo info; int result = AndroidBitmap_getInfo(env, jbitmap, &info); diff --git a/packages/services/PacProcessor/jni/Android.mk b/packages/services/PacProcessor/jni/Android.mk index 26c56c92a74b..254cbc23c471 100644 --- a/packages/services/PacProcessor/jni/Android.mk +++ b/packages/services/PacProcessor/jni/Android.mk @@ -36,4 +36,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libjni_pacprocessor LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code + include $(BUILD_SHARED_LIBRARY) diff --git a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp index c5aa13bb26eb..77b711384ba7 100644 --- a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp +++ b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp @@ -60,7 +60,7 @@ jstring string16ToJstring(JNIEnv* env, String16 string) { return env->NewString(str, len); } -static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JNIEnv* env, +static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JNIEnv* /* env */, jobject) { if (proxyResolver == NULL) { logger = new ProxyErrorLogger(); @@ -72,7 +72,7 @@ static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JN return JNI_TRUE; } -static jboolean com_android_pacprocessor_PacNative_destroyV8ParserNativeLocked(JNIEnv* env, +static jboolean com_android_pacprocessor_PacNative_destroyV8ParserNativeLocked(JNIEnv* /* env *, jobject) { if (proxyResolver != NULL) { delete logger; diff --git a/packages/services/PacProcessor/jni/jni_init.cpp b/packages/services/PacProcessor/jni/jni_init.cpp index bda33fb33c07..de844c87ec0b 100644 --- a/packages/services/PacProcessor/jni/jni_init.cpp +++ b/packages/services/PacProcessor/jni/jni_init.cpp @@ -25,7 +25,7 @@ namespace android { using namespace android; -extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { +extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) { JNIEnv *env; if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { ALOGE("ERROR: GetEnv failed"); |