LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use -Werror in development" am: 14b2eeb009

Browse Source 
am: cee88a6a9a

Change-Id: I04f10d5d80f6ca8c58ad5ba609b95ba98507b250
This commit is contained in:
Chih-Hung Hsieh
2017-10-27 23:57:58 +00:00
committed by android-build-merger
parent 73599ec3c7 cee88a6a9a
commit a38ca6bb58
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/SimpleJNI/jni/Android.mk
View File

@@ -41,8 +41,7 @@ LOCAL_STATIC_LIBRARIES :=
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) $(JNI_H_INCLUDE)
# No special compiler flags. LOCAL_CFLAGS := -Wall -Werror
LOCAL_CFLAGS +=
LOCAL_CXX_STL := none LOCAL_CXX_STL := none

4
samples/SimpleJNI/jni/native.cpp
View File

@@ -22,7 +22,7 @@
#include "jni.h" #include "jni.h"
static jint static jint
add(JNIEnv *env, jobject thiz, jint a, jint b) { add(JNIEnv* /*env*/, jobject /*thiz*/, jint a, jint b) {
int result = a + b; int result = a + b;
ALOGI("%d + %d = %d", a, b, result); ALOGI("%d + %d = %d", a, b, result);
return result; return result;
@@ -82,7 +82,7 @@ typedef union {
void* venv; void* venv;
} UnionJNIEnvToVoid; } UnionJNIEnvToVoid;
jint JNI_OnLoad(JavaVM* vm, void* reserved) jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
{ {
UnionJNIEnvToVoid uenv; UnionJNIEnvToVoid uenv;
uenv.venv = NULL; uenv.venv = NULL;

2
tools/line_endings/line_endings.c
View File

@@ -88,7 +88,7 @@ main(int argc, char** argv)
len -= amt2; len -= amt2;
} }
ftruncate(fd, 0); (void)ftruncate(fd, 0);
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
while (root) { while (root) {
ssize_t amt2 = strlen(root->buf); ssize_t amt2 = strlen(root->buf);

6
tutorials/MoarRam/jni/Android.mk
View File

@@ -15,12 +15,15 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
MoarRam_jni_cflags := -Wall -Werror -Wno-unused-parameter
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmoarram-32 LOCAL_MODULE := libmoarram-32
LOCAL_SRC_FILES := foo.c LOCAL_SRC_FILES := foo.c
LOCAL_SHARED_LIBRARIES += liblog LOCAL_SHARED_LIBRARIES += liblog
LOCAL_CFLAGS := $(MoarRam_jni_cflags)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
@@ -30,6 +33,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmoarram-2M LOCAL_MODULE := libmoarram-2M
LOCAL_SRC_FILES := bar.c LOCAL_SRC_FILES := bar.c
LOCAL_SHARED_LIBRARIES += liblog LOCAL_SHARED_LIBRARIES += liblog
LOCAL_CFLAGS := $(MoarRam_jni_cflags)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
@@ -39,6 +43,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmoarram-17_71 LOCAL_MODULE := libmoarram-17_71
LOCAL_SRC_FILES := baz.c LOCAL_SRC_FILES := baz.c
LOCAL_SHARED_LIBRARIES += liblog LOCAL_SHARED_LIBRARIES += liblog
LOCAL_CFLAGS := $(MoarRam_jni_cflags)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
@@ -48,5 +53,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmoarram-doublefree LOCAL_MODULE := libmoarram-doublefree
LOCAL_SRC_FILES := df.c LOCAL_SRC_FILES := df.c
LOCAL_SHARED_LIBRARIES += liblog LOCAL_SHARED_LIBRARIES += liblog
LOCAL_CFLAGS := $(MoarRam_jni_cflags)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)