| commit | eb92aefeadc06864834ed7dfa88d6baa239258ea | [log] [tgz] |
|---|---|---|
| author | Chih-hung Hsieh <chh@google.com> | Tue Nov 14 19:40:50 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Nov 14 19:40:50 2017 +0000 |
| tree | 6eb1a118933be4d33faf72b75191fac59f15f6d2 | |
| parent | cb334157943b9bf78e0b9c1237d264fa844edf01 [diff] | |
| parent | 5b1bb090cbdd0786b001481c115fb11906b150bb [diff] |
Merge "Use -Werror in device/sample/frameworks/PlatformLibrary/jni"
diff --git a/frameworks/PlatformLibrary/jni/Android.mk b/frameworks/PlatformLibrary/jni/Android.mk index d19b6cc..2b91f05 100644 --- a/frameworks/PlatformLibrary/jni/Android.mk +++ b/frameworks/PlatformLibrary/jni/Android.mk
@@ -43,7 +43,6 @@ LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) -# No specia compiler flags. -LOCAL_CFLAGS += +LOCAL_CFLAGS += -Wall -Werror include $(BUILD_SHARED_LIBRARY)
diff --git a/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp b/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp index 428d0a8..b03c385 100644 --- a/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp +++ b/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp
@@ -250,7 +250,7 @@ /* * This is called by the VM when the shared library is first loaded. */ -jint JNI_OnLoad(JavaVM* vm, void* reserved) { +jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/) { JNIEnv* env = NULL; jint result = -1;