commit a36d019e2c1702caea00d23420405e2759dc58bc
author Chih-hung Hsieh <chh@google.com> Fri Dec 15 23:34:51 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 15 23:34:51 2017 +0000
tree 8f64423017df8872d8ebbec47b95db3a89f6117a
parent 45944e5c63d496ffd0509ce7687e322843ae73d2
parent b865cdd5d5bfdb065fe97bd769bc97f1007d83de

Merge "Suppress warnings in external/skia."

Android.bp

diff --git a/Android.bp b/Android.bp
index f06be4b..7676cd3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,6 +5,7 @@
     cflags: [
         "-fexceptions",
         "-Wno-unused-parameter",
+        "-Wno-unused-variable",
         "-U_FORTIFY_SOURCE",
         "-D_FORTIFY_SOURCE=1",
         "-DSKIA_IMPLEMENTATION=1",
@@ -859,6 +860,7 @@
 
     cflags: [
         "-Wno-unused-parameter",
+        "-Wno-unused-variable",
     ],
 
     local_include_dirs: [
@@ -1637,6 +1639,7 @@
 
     cflags: [
         "-Wno-unused-parameter",
+        "-Wno-unused-variable",
     ],
 
     local_include_dirs: [

gn/gn_to_bp.py

diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
index b073c93..ef8fc08 100644
--- a/gn/gn_to_bp.py
+++ b/gn/gn_to_bp.py
@@ -16,6 +16,7 @@
 
 tool_cflags = [
     '-Wno-unused-parameter',
+    '-Wno-unused-variable',
 ]
 
 # It's easier to maintain one list instead of separate lists.
@@ -57,6 +58,7 @@
     cflags: [
         "-fexceptions",
         "-Wno-unused-parameter",
+        "-Wno-unused-variable",
         "-U_FORTIFY_SOURCE",
         "-D_FORTIFY_SOURCE=1",
         "-DSKIA_IMPLEMENTATION=1",