commit 7e15c8b0f97e373ef4a32ae5cbde3c257205cb85
author Chih-hung Hsieh <chh@google.com> Thu Oct 12 02:27:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 02:27:10 2017 +0000
tree b8b3489d3af1a95f049c8e03e71c317a9a0dc401
parent 7e3e33dca39641aa25ecc76b9795495aa32b32e1
parent 9d42ff67e2557de445b8093be14e36231196d03a

Revert "Use -Werror in external/libtextclassifier" am: 978467b255 am: 7102557719 am: 8447aa2863
am: 9d42ff67e2

Change-Id: I3ca71b9fe455b2970e5c0cddc6a14e12e8f6dad8

Android.mk

diff --git a/Android.mk b/Android.mk
index 8986c34..0959572 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,18 +23,12 @@
 LOCAL_PATH := $(call my-dir)
 
 # Custom C/C++ compilation flags:
-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-parameter \
-
 MY_LIBTEXTCLASSIFIER_CFLAGS := \
-    $(MY_LIBTEXTCLASSIFIER_WARNING_CFLAGS) \
+    -Wno-unused-parameter \
+    -Wno-sign-compare \
+    -Wno-missing-field-initializers \
+    -Wno-ignored-qualifiers \
+    -Wno-undefined-var-template \
     -fvisibility=hidden
 
 # Only enable debug logging in userdebug/eng builds.
@@ -55,8 +49,6 @@
 LOCAL_SRC_FILES := $(call all-proto-files-under, .)
 LOCAL_SHARED_LIBRARIES := libprotobuf-cpp-lite
 
-LOCAL_CFLAGS := $(MY_LIBTEXTCLASSIFIER_WARNING_CFLAGS)
-
 include $(BUILD_STATIC_LIBRARY)
 
 # -----------------
@@ -268,5 +260,4 @@
 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)