commit e21f3418be2e323ad1ed64d79f862474f2c98c76
author Chih-hung Hsieh <chh@google.com> Mon Dec 17 15:09:45 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 17 15:09:45 2018 -0800
tree ebe720944fed506f0d6f70268c00308e4da3462f
parent 8a05b94e8bac22bda3e89aede3d9bf1932f68b9c
parent 588a335fda96327ddd3e1a133bda219fde2281a2

Merge "Remove redundant Wno-error." am: b09dcb15d5 am: c2e9546757
am: 588a335fda

Change-Id: I4939be7a90acf307ffd8bfb57d512b5f7f7aa490

drm/libmediadrm/Android.bp

diff --git a/drm/libmediadrm/Android.bp b/drm/libmediadrm/Android.bp
index 94f9e02..41d1833 100644
--- a/drm/libmediadrm/Android.bp
+++ b/drm/libmediadrm/Android.bp
@@ -73,7 +73,6 @@
         // Suppress unused parameter and no error options. These cause problems
         // with the when using the map type in a proto definition.
         "-Wno-unused-parameter",
-        "-Wno-error",
     ],
 }
 
@@ -106,7 +105,6 @@
         // Suppress unused parameter and no error options. These cause problems
         // when using the map type in a proto definition.
         "-Wno-unused-parameter",
-        "-Wno-error",
     ],
 }
 

drm/libmediadrm/tests/Android.bp

diff --git a/drm/libmediadrm/tests/Android.bp b/drm/libmediadrm/tests/Android.bp
index dcd59b7..9e0115e 100644
--- a/drm/libmediadrm/tests/Android.bp
+++ b/drm/libmediadrm/tests/Android.bp
@@ -34,7 +34,6 @@
         // Suppress unused parameter and no error options. These cause problems
         // when using the map type in a proto definition.
         "-Wno-unused-parameter",
-        "-Wno-error",
     ]
 }