summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2017-10-19 21:32:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 21:32:49 +0000
commit42ff0a4ae58a6ea5f67d06c0bbdc3b964775b9a9 (patch)
tree1fefc164e692c2272dcb1c4f182eb1353cb20327
parent9d42ff67e2557de445b8093be14e36231196d03a (diff)
parent2799500b9eeb2de7602e08181cd20b6b58e2f3d5 (diff)
downloadandroid_external_libtextclassifier-42ff0a4ae58a6ea5f67d06c0bbdc3b964775b9a9.tar.gz
android_external_libtextclassifier-42ff0a4ae58a6ea5f67d06c0bbdc3b964775b9a9.tar.bz2
android_external_libtextclassifier-42ff0a4ae58a6ea5f67d06c0bbdc3b964775b9a9.zip
Use -Werror in external/libtextclassifier am: f433e92721 am: 98d9452bb8
am: 2799500b9e Change-Id: I601fa5ab067936fb53ce8531ec243b24ac024fcb
-rw-r--r--Android.mk18
1 files changed, 14 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 0959572..b4ce617 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,12 +23,19 @@
LOCAL_PATH := $(call my-dir)
# Custom C/C++ compilation flags:
-MY_LIBTEXTCLASSIFIER_CFLAGS := \
- -Wno-unused-parameter \
- -Wno-sign-compare \
- -Wno-missing-field-initializers \
+MY_LIBTEXTCLASSIFIER_WARNING_CFLAGS := \
+ -Wall \
+ -Werror \
-Wno-ignored-qualifiers \
+ -Wno-missing-field-initializers \
+ -Wno-sign-compare \
+ -Wno-tautological-constant-out-of-range-compare \
-Wno-undefined-var-template \
+ -Wno-unused-function \
+ -Wno-unused-parameter \
+
+MY_LIBTEXTCLASSIFIER_CFLAGS := \
+ $(MY_LIBTEXTCLASSIFIER_WARNING_CFLAGS) \
-fvisibility=hidden
# Only enable debug logging in userdebug/eng builds.
@@ -49,6 +56,8 @@ LOCAL_STRIP_MODULE := $(LIBTEXTCLASSIFIER_STRIP_OPTS)
LOCAL_SRC_FILES := $(call all-proto-files-under, .)
LOCAL_SHARED_LIBRARIES := libprotobuf-cpp-lite
+LOCAL_CFLAGS := $(MY_LIBTEXTCLASSIFIER_WARNING_CFLAGS)
+
include $(BUILD_STATIC_LIBRARY)
# -----------------
@@ -260,4 +269,5 @@ LOCAL_REQUIRED_MODULES := textclassifier.smartselection.en.model
LOCAL_REQUIRED_MODULES += textclassifier.smartselection.es.model
LOCAL_REQUIRED_MODULES += textclassifier.smartselection.de.model
LOCAL_REQUIRED_MODULES += textclassifier.smartselection.fr.model
+LOCAL_CFLAGS := $(MY_LIBTEXTCLASSIFIER_WARNING_CFLAGS)
include $(BUILD_STATIC_LIBRARY)