commit e3dd8ccbcaf2501f11b87ced817ea9d45f3f0ded
author Yi Kong <yikong@google.com> Fri Sep 20 18:06:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 20 18:06:17 2019 -0700
tree f832b156820587f295426f6c9757a430c2c9610f
parent 77e15050c501771bbbe3d986348ddc00581bc84b
parent b5cf187c9179e04cf42fe224e3dd1d7cd88d027c

Merge "Ignore format-pedantic compiler warning" am: 52aa495074 am: 8bd9fdaea2
am: b5cf187c91

Change-Id: I44cba662f3306c1f940512204294d2656f80ca0b

libs/ui/Android.bp

diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index 1a0d8c0..2518e93 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -47,6 +47,7 @@
         "-Wno-padded",
 
         "-Wno-switch-enum",
+        "-Wno-format-pedantic",
     ],
 
     sanitize: {

vulkan/libvulkan/Android.bp

diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp
index df5f1eb..b0c4f3f 100644
--- a/vulkan/libvulkan/Android.bp
+++ b/vulkan/libvulkan/Android.bp
@@ -46,6 +46,7 @@
         "-Wno-padded",
         "-Wno-switch-enum",
         "-Wno-undef",
+        "-Wno-format-pedantic",
 
         // Have clang emit complete debug_info.
         "-fstandalone-debug",