diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-14 19:15:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 19:15:52 +0000 |
| commit | 2e4ad0a64162446f9632b45bf08bf5405fab54f1 (patch) | |
| tree | c00caec43c95faf0553fcdc2c3b952587ef50206 /packages/services | |
| parent | ed5d5fb434eb2169f14d06649336f211117e2bee (diff) | |
| parent | d99c25eff3ad421b900caf7af82f970b23a81733 (diff) | |
am d99c25ef: am 37079e29: Merge "Frameworks/base: Wall Werror in packages"
* commit 'd99c25eff3ad421b900caf7af82f970b23a81733':
Frameworks/base: Wall Werror in packages
Diffstat (limited to 'packages/services')
3 files changed, 5 insertions, 3 deletions
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"); |