packages/apps/Gallery2
| Révision | 5b7d5244e942163f0d8debce457de3d9676c7737 (tree) |
|---|---|
| l'heure | 2017-11-03 09:47:09 |
| Auteur | Chih-hung Hsieh <chh@goog...> |
| Commiter | android-build-merger |
Merge "Use -Werror in packages/apps/Gallery2"
am: 24309021fb
Change-Id: Iee490c18f1d60f20ba19e304614c01fe481ff0d8
jni/Android.mk (diff) jni_jpegstream/Android.mk (diff)| @@ -1,9 +1,16 @@ | ||
| 1 | 1 | LOCAL_PATH:= $(call my-dir) |
| 2 | 2 | |
| 3 | +Gallery2_jni_cflags := \ | |
| 4 | + -Wall -Wextra -Werror \ | |
| 5 | + -Wno-error=constant-conversion \ | |
| 6 | + -Wno-unused-parameter \ | |
| 7 | + | |
| 8 | +# to fix implicit conversion from 'int' to 'char', (255 to -1, 128 to -128) | |
| 9 | + | |
| 3 | 10 | include $(CLEAR_VARS) |
| 4 | 11 | |
| 5 | -LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -Wno-unused-parameter | |
| 6 | -LOCAL_CFLAGS += -Wall -Wextra | |
| 12 | +LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES | |
| 13 | +LOCAL_CFLAGS += $(Gallery2_jni_cflags) | |
| 7 | 14 | |
| 8 | 15 | LOCAL_SRC_FILES := jni_egl_fence.cpp |
| 9 | 16 |
| @@ -45,8 +52,8 @@ LOCAL_SRC_FILES := filters/gradient.c \ | ||
| 45 | 52 | filters/tinyplanet.cc \ |
| 46 | 53 | filters/kmeans.cc |
| 47 | 54 | |
| 48 | -LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops -Wno-unused-parameter | |
| 49 | -LOCAL_CFLAGS += -Wall -Wextra | |
| 55 | +LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops | |
| 56 | +LOCAL_CFLAGS += $(Gallery2_jni_cflags) | |
| 50 | 57 | LOCAL_LDLIBS := -llog -ljnigraphics |
| 51 | 58 | LOCAL_ARM_MODE := arm |
| 52 | 59 |
| @@ -17,7 +17,7 @@ LOCAL_SDK_VERSION := 17 | ||
| 17 | 17 | LOCAL_ARM_MODE := arm |
| 18 | 18 | |
| 19 | 19 | LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops |
| 20 | -LOCAL_CFLAGS += -Wall -Wextra | |
| 20 | +LOCAL_CFLAGS += -Wall -Wextra -Werror | |
| 21 | 21 | LOCAL_LDLIBS := -llog |
| 22 | 22 | |
| 23 | 23 | LOCAL_CPP_EXTENSION := .cpp |
Fork