commit fcad0c8fad0e269abb4bcf4f38e0d0449ce6e944
author Yi Kong <yikong@google.com> Tue Mar 19 11:46:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 19 11:46:18 2019 -0700
tree 85549b97f492205098971dcbf4b5543b5a3b766b
parent 91930349b3d53990630456b2be13d04f7f61de7a
parent 92a6baefda544d5e4c68279707fbe41c423d4573

Merge "Suppress -Wstring-plus-int warning"
am: 63c89a37fd

Change-Id: I99867a9a01c569e4ca9316046775ca415f41a727

liblog/logger_write.cpp

diff --git a/liblog/logger_write.cpp b/liblog/logger_write.cpp
index 908fe7f..7fa3f43 100644
--- a/liblog/logger_write.cpp
+++ b/liblog/logger_write.cpp
@@ -413,6 +413,8 @@
   if (!tag) tag = "";
 
   /* XXX: This needs to go! */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstring-plus-int"
   if (bufID != LOG_ID_RADIO) {
     switch (tag[0]) {
       case 'H':
@@ -454,6 +456,7 @@
         break;
     }
   }
+#pragma clang diagnostic pop
 
 #if __BIONIC__
   if (prio == ANDROID_LOG_FATAL) {