Merge "Do not use -Werror yet." am: ed8aa2854c
am: 9ce9433d7c

Change-Id: Id4cb740640e53a3fd95c2b01b6ac9418348248fe
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/Android.bp b/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
index 52dd09f..310cc5b 100644
--- a/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
+++ b/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
@@ -14,7 +14,7 @@
     cflags: [
         "-DNXP_LDR_SVC_VER_2=TRUE",
         "-Wall",
-        "-Werror",
+        // "-Werror", // has multiple warnings with some asan-userdebug target
         "-Wno-format",
         "-Wno-parentheses-equality",
         "-Wno-tautological-constant-out-of-range-compare",