summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2018-12-17 15:09:45 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-17 15:09:45 -0800
commite21f3418be2e323ad1ed64d79f862474f2c98c76 (patch)
treeebe720944fed506f0d6f70268c00308e4da3462f /drm
parent8a05b94e8bac22bda3e89aede3d9bf1932f68b9c (diff)
parent588a335fda96327ddd3e1a133bda219fde2281a2 (diff)
downloadframeworks_av-e21f3418be2e323ad1ed64d79f862474f2c98c76.tar.gz
frameworks_av-e21f3418be2e323ad1ed64d79f862474f2c98c76.tar.bz2
frameworks_av-e21f3418be2e323ad1ed64d79f862474f2c98c76.zip
Merge "Remove redundant Wno-error." am: b09dcb15d5 am: c2e9546757
am: 588a335fda Change-Id: I4939be7a90acf307ffd8bfb57d512b5f7f7aa490
Diffstat (limited to 'drm')
-rw-r--r--drm/libmediadrm/Android.bp2
-rw-r--r--drm/libmediadrm/tests/Android.bp1
2 files changed, 0 insertions, 3 deletions
diff --git a/drm/libmediadrm/Android.bp b/drm/libmediadrm/Android.bp
index 94f9e02d7e..41d18332ef 100644
--- a/drm/libmediadrm/Android.bp
+++ b/drm/libmediadrm/Android.bp
@@ -73,7 +73,6 @@ cc_library_shared {
// 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 @@ cc_library_shared {
// Suppress unused parameter and no error options. These cause problems
// when using the map type in a proto definition.
"-Wno-unused-parameter",
- "-Wno-error",
],
}
diff --git a/drm/libmediadrm/tests/Android.bp b/drm/libmediadrm/tests/Android.bp
index dcd59b7b7f..9e0115e635 100644
--- a/drm/libmediadrm/tests/Android.bp
+++ b/drm/libmediadrm/tests/Android.bp
@@ -34,7 +34,6 @@ cc_test {
// Suppress unused parameter and no error options. These cause problems
// when using the map type in a proto definition.
"-Wno-unused-parameter",
- "-Wno-error",
]
}