Revert "Use the global default cpp_std."
This reverts commit ad434d79398f6493a9d5e14d7f08703d14fe08c8.
Reason for revert: Droidmonitor triggered revert due to build breakage in b/346434347. Will be verifying through ABTD before submission.
Change-Id: I3fc1e2d82ad291b8aecfb6d1cc13b63200251edc
diff --git a/media/codec2/components/avc/C2SoftAvcDec.h b/media/codec2/components/avc/C2SoftAvcDec.h
index 6165455..36a463e 100644
--- a/media/codec2/components/avc/C2SoftAvcDec.h
+++ b/media/codec2/components/avc/C2SoftAvcDec.h
@@ -173,7 +173,7 @@
VuiColorAspects()
: primaries(2), transfer(2), coeffs(2), fullRange(0) { }
- bool operator==(const VuiColorAspects &o) const {
+ bool operator==(const VuiColorAspects &o) {
return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs
&& fullRange == o.fullRange;
}
diff --git a/media/codec2/components/dav1d/C2SoftDav1dDec.h b/media/codec2/components/dav1d/C2SoftDav1dDec.h
index c5c1214..6008325 100644
--- a/media/codec2/components/dav1d/C2SoftDav1dDec.h
+++ b/media/codec2/components/dav1d/C2SoftDav1dDec.h
@@ -91,7 +91,7 @@
coeffs(C2Color::MATRIX_UNSPECIFIED),
fullRange(C2Color::RANGE_UNSPECIFIED) {}
- bool operator==(const VuiColorAspects& o) const {
+ bool operator==(const VuiColorAspects& o) {
return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs &&
fullRange == o.fullRange;
}
diff --git a/media/codec2/components/gav1/C2SoftGav1Dec.h b/media/codec2/components/gav1/C2SoftGav1Dec.h
index e5d10e0..0e09fcc 100644
--- a/media/codec2/components/gav1/C2SoftGav1Dec.h
+++ b/media/codec2/components/gav1/C2SoftGav1Dec.h
@@ -84,7 +84,7 @@
coeffs(C2Color::MATRIX_UNSPECIFIED),
fullRange(C2Color::RANGE_UNSPECIFIED) { }
- bool operator==(const VuiColorAspects &o) const {
+ bool operator==(const VuiColorAspects &o) {
return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs
&& fullRange == o.fullRange;
}
diff --git a/media/codec2/components/hevc/C2SoftHevcDec.h b/media/codec2/components/hevc/C2SoftHevcDec.h
index ff6d371..6abf69e 100644
--- a/media/codec2/components/hevc/C2SoftHevcDec.h
+++ b/media/codec2/components/hevc/C2SoftHevcDec.h
@@ -132,7 +132,7 @@
VuiColorAspects()
: primaries(2), transfer(2), coeffs(2), fullRange(0) { }
- bool operator==(const VuiColorAspects &o) const {
+ bool operator==(const VuiColorAspects &o) {
return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs
&& fullRange == o.fullRange;
}
diff --git a/media/codec2/components/mpeg2/C2SoftMpeg2Dec.h b/media/codec2/components/mpeg2/C2SoftMpeg2Dec.h
index a7bee90..3965bcc 100644
--- a/media/codec2/components/mpeg2/C2SoftMpeg2Dec.h
+++ b/media/codec2/components/mpeg2/C2SoftMpeg2Dec.h
@@ -172,7 +172,7 @@
VuiColorAspects()
: primaries(2), transfer(2), coeffs(2), fullRange(0) { }
- bool operator==(const VuiColorAspects &o) const {
+ bool operator==(const VuiColorAspects &o) {
return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs
&& fullRange == o.fullRange;
}
diff --git a/media/codec2/vndk/Android.bp b/media/codec2/vndk/Android.bp
index 327c3fd..dc06ee6 100644
--- a/media/codec2/vndk/Android.bp
+++ b/media/codec2/vndk/Android.bp
@@ -180,6 +180,7 @@
// public dependency for implementing Codec 2 components
cc_defaults {
name: "libcodec2-impl-defaults",
+ cpp_std: "gnu++17",
defaults: [
"libcodec2_hal_selection",