commit 588a335fda96327ddd3e1a133bda219fde2281a2
author Chih-hung Hsieh <chh@google.com> Mon Dec 17 15:00:14 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 17 15:00:14 2018 -0800
tree 54218384a06aa139c09401371a3fec3ec40c8612
parent 538d53267bee085e08d489546bde620520b5b188
parent c2e95467573518f6bf04cefecb62ebd606b6e96b

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

Change-Id: I72bf81976dfca3d4868c5428f02f7cc6038a4b86

drm/libmediadrm/Android.bp

diff --git a/drm/libmediadrm/Android.bp b/drm/libmediadrm/Android.bp
index 4991e50..91d1f7e 100644
--- a/drm/libmediadrm/Android.bp
+++ b/drm/libmediadrm/Android.bp
@@ -72,7 +72,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",
     ],
 }
 
@@ -105,7 +104,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 66c906f..7628968 100644
--- a/drm/libmediadrm/tests/Android.bp
+++ b/drm/libmediadrm/tests/Android.bp
@@ -33,7 +33,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",
     ]
 }