diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-05-26 23:51:58 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-05-26 23:59:46 +0300 |
| commit | 32be0c56f7b248f2a9cdeb714f072d9d89600e54 (patch) | |
| tree | 34769c7208d6363e9705ca7a625b30794a6057e8 | |
| parent | 9b25adf30c7dd026ae0964ee066e2fbfa61c24b3 (diff) | |
| download | android_packages_apps_Gallery2-32be0c56f7b248f2a9cdeb714f072d9d89600e54.tar.gz android_packages_apps_Gallery2-32be0c56f7b248f2a9cdeb714f072d9d89600e54.tar.bz2 android_packages_apps_Gallery2-32be0c56f7b248f2a9cdeb714f072d9d89600e54.zip | |
Revert "Use -Werror in packages/apps/Gallery2"
* We'll take the upstream fix
This reverts commit fb3125e4edc6aa1bfc1f7afc189e9af41a9b1c32.
Change-Id: Ic7b2b0bc2e3a766584e07e36b89f10e0a46ffce6
| -rw-r--r-- | jni/Android.mk | 11 | ||||
| -rw-r--r-- | jni_jpegstream/Android.mk | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index ee6b360ce..e9c1ec31b 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,16 +1,8 @@ LOCAL_PATH:= $(call my-dir) -Gallery2_jni_cflags := \ - -Wall -Wextra -Werror \ - -Wno-error=constant-conversion \ - -Wno-unused-parameter \ - -# to fix implicit conversion from 'int' to 'char', (255 to -1, 128 to -128) - include $(CLEAR_VARS) LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -LOCAL_CFLAGS += $(Gallery2_jni_cflags) LOCAL_SRC_FILES := jni_egl_fence.cpp @@ -55,8 +47,7 @@ LOCAL_SRC_FILES := filters/gradient.c \ filters/tinyplanet.cc \ filters/kmeans.cc -LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops -LOCAL_CFLAGS += $(Gallery2_jni_cflags) +LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops LOCAL_LDLIBS := -llog -ljnigraphics LOCAL_ARM_MODE := arm diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk index 81ea28810..461e9b63c 100644 --- a/jni_jpegstream/Android.mk +++ b/jni_jpegstream/Android.mk @@ -19,7 +19,6 @@ LOCAL_ARM_MODE := arm LOCAL_PRODUCT_MODULE := true LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops -LOCAL_CFLAGS += -Wall -Wextra -Werror LOCAL_CPPFLAGS += $(JNI_CFLAGS) LOCAL_LDLIBS := -llog |