Merge "Temporarily suppress user-defined-warning in external/sfntly" am: a217f56dac am: f4795d699dandroid-o-mr1-preview-2android-o-mr1-preview-1

am: cee31ff94d

Change-Id: I9c8f891aef331a2e8d81df93d799f8356b6bd525

1 files changed, 3 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index f817981..862ae81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -125,6 +125,9 @@ cc_library_static {
         "-Wno-error=c++0x-compat",
         "-Wno-non-virtual-dtor",
         "-Wno-sign-promo",
+
+        // Temporarily suppress the warning http://b/37911198
+        "-Wno-error=user-defined-warnings",
     ],
 
     debug: {