diff options
| author | Tomasz Wasilczyk <twasilczyk@google.com> | 2017-04-20 16:19:01 +0000 |
|---|---|---|
| committer | Tomasz Wasilczyk <twasilczyk@google.com> | 2017-04-20 16:22:29 +0000 |
| commit | 928e3fad337612be1aa8a8872f20a245585756ef (patch) | |
| tree | 2ca733b4474d95d7243411f5d142fce7c46667a8 | |
| parent | a836402ee66cc1d723fa752ff5cff9930c1249c6 (diff) | |
| download | android_packages_apps_Gallery2-928e3fad337612be1aa8a8872f20a245585756ef.tar.gz android_packages_apps_Gallery2-928e3fad337612be1aa8a8872f20a245585756ef.tar.bz2 android_packages_apps_Gallery2-928e3fad337612be1aa8a8872f20a245585756ef.zip | |
Revert setting Werror flag - there are still warnings on some builds.
Change-Id: I94a2c0f5885e19d186506062e67d538ae3c7bf09
Test: it builds.
Bug: b/37159108
| -rw-r--r-- | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni_jpegstream/Android.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 6e0552a67..32c7163a3 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -3,7 +3,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -Wno-unused-parameter -LOCAL_CFLAGS += -Wall -Wextra -Werror +LOCAL_CFLAGS += -Wall -Wextra LOCAL_SRC_FILES := jni_egl_fence.cpp @@ -46,7 +46,7 @@ LOCAL_SRC_FILES := filters/gradient.c \ filters/kmeans.cc LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops -Wno-unused-parameter -LOCAL_CFLAGS += -Wall -Wextra -Werror +LOCAL_CFLAGS += -Wall -Wextra LOCAL_LDLIBS := -llog -ljnigraphics LOCAL_ARM_MODE := arm diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk index cac2a7b72..f3a631d0c 100644 --- a/jni_jpegstream/Android.mk +++ b/jni_jpegstream/Android.mk @@ -17,7 +17,7 @@ LOCAL_SDK_VERSION := 17 LOCAL_ARM_MODE := arm LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops -LOCAL_CFLAGS += -Wall -Wextra -Werror +LOCAL_CFLAGS += -Wall -Wextra LOCAL_LDLIBS := -llog LOCAL_CPP_EXTENSION := .cpp |