Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37079e29 authored by Andreas Gampe's avatar Andreas Gampe Committed by Gerrit Code Review
Browse files

Merge "Frameworks/base: Wall Werror in packages"

parents 0626ec58 423ba098

packages/DefaultContainerService/jni/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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)

packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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)) {

packages/PrintSpooler/jni/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)

packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

packages/services/PacProcessor/jni/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)