commit a315c538e27683c3ea36044b0859eaa1a43f3e62
author Yi Kong <yikong@google.com> Fri Sep 20 18:12:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 20 18:12:55 2019 -0700
tree 8b13c5e8b9091fc30c4aa769e717d0ec44eba45f
parent d4e05271f7aeb1c46188296708148fafcb2aabc4
parent e3dd8ccbcaf2501f11b87ced817ea9d45f3f0ded

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

Change-Id: Ie56397db6e32008b7998cd4a65ddaabfb86bf31f

libs/ui/Android.bp

diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index bb85acc..47137f1 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 83a5250..5686891 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",