diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-11 01:56:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-11 01:56:11 +0000 |
| commit | ce23ecffea9ec4ebe97d91a59e1997aaa77562c9 (patch) | |
| tree | e27837a28ea723369612ea450d081605e51c9d86 | |
| parent | 827909fca34fc144a058ca91cd909bd4265774d0 (diff) | |
| parent | cad87d78da79c3d2ac83e1dce6ee2a9d2f6d64e5 (diff) | |
| download | frameworks_base-ce23ecffea9ec4ebe97d91a59e1997aaa77562c9.zip frameworks_base-ce23ecffea9ec4ebe97d91a59e1997aaa77562c9.tar.gz frameworks_base-ce23ecffea9ec4ebe97d91a59e1997aaa77562c9.tar.bz2 | |
Merge "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 3154030..88954f0 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 df0751d..ea32edc 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) { |