diff options
| author | 2014-11-11 02:16:13 +0000 | |
|---|---|---|
| committer | 2014-11-11 02:16:13 +0000 | |
| commit | 7188903963c6dd497fb44d1c7eb87c075473de9f (patch) | |
| tree | c0452f92fc5f69c4f5f00b61fffe0713ea578253 | |
| parent | 37fcecde6d0053eac3eda237af404819700d6a1d (diff) | |
| parent | ce23ecffea9ec4ebe97d91a59e1997aaa77562c9 (diff) | |
am ce23ecff: Merge "Frameworks/base: Wall Werror in native/graphics"
* commit 'ce23ecffea9ec4ebe97d91a59e1997aaa77562c9':
Frameworks/base: Wall Werror in native/graphics
| -rw-r--r-- | native/graphics/jni/Android.mk | 12 | ||||
| -rw-r--r-- | native/graphics/jni/bitmap.cpp | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk index 31540307f586..88954f04cd33 100644 --- a/native/graphics/jni/Android.mk +++ b/native/graphics/jni/Android.mk @@ -6,27 +6,29 @@ include $(CLEAR_VARS) # setup for skia optimizations # ifneq ($(ARCH_ARM_HAVE_VFP),true) - LOCAL_CFLAGS += -DSK_SOFTWARE_FLOAT + LOCAL_CFLAGS += -DSK_SOFTWARE_FLOAT endif ifeq ($(ARCH_ARM_HAVE_NEON),true) - LOCAL_CFLAGS += -D__ARM_HAVE_NEON + LOCAL_CFLAGS += -D__ARM_HAVE_NEON endif # our source files # LOCAL_SRC_FILES:= \ - bitmap.cpp + bitmap.cpp LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ libskia LOCAL_C_INCLUDES += \ - frameworks/base/native/include \ - frameworks/base/core/jni/android/graphics + frameworks/base/native/include \ + frameworks/base/core/jni/android/graphics LOCAL_MODULE:= libjnigraphics +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code + include $(BUILD_SHARED_LIBRARY) diff --git a/native/graphics/jni/bitmap.cpp b/native/graphics/jni/bitmap.cpp index df0751d0fe5f..ea32edc9955e 100644 --- a/native/graphics/jni/bitmap.cpp +++ b/native/graphics/jni/bitmap.cpp @@ -15,7 +15,11 @@ */ #include <android/bitmap.h> + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" #include <GraphicsJNI.h> +#pragma GCC diagnostic pop int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, AndroidBitmapInfo* info) { |