commit 436c0600f789131a3b5f2b33cc704ea0fafd6090
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 01 17:28:18 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 01 17:28:18 2023 +0000
tree 72347ba2023a8f3786d777dfd7507c3e583641cc
parent 87b50353d9c0f8e6553407dbac8dab7c8c303475
parent e86f6936a7dc84983823cab51a11455d60b983fb

Merge "DownmixProcess: Add a check to verify that input and output frame counts are same." into main

media/utils/include/mediautils/FixedString.h

diff --git a/media/utils/include/mediautils/FixedString.h b/media/utils/include/mediautils/FixedString.h
index 047aa82..c316813 100644
--- a/media/utils/include/mediautils/FixedString.h
+++ b/media/utils/include/mediautils/FixedString.h
@@ -101,10 +101,15 @@
         return strncmp(c_str(), s, capacity() + 1) == 0;
     }
 
-    bool operator==(std::string_view s) const {
+    bool operator==(const std::string_view s) const {
         return size() == s.size() && memcmp(data(), s.data(), size()) == 0;
     }
 
+    template <uint32_t N_>
+    bool operator==(const FixedString<N_>& s) const {
+        return operator==(s.asStringView());
+    }
+
     // operator not-equals
     template <typename T>
     bool operator!=(const T& other) const {

media/utils/tests/Android.bp

diff --git a/media/utils/tests/Android.bp b/media/utils/tests/Android.bp
index 0d6a4c5..0689083 100644
--- a/media/utils/tests/Android.bp
+++ b/media/utils/tests/Android.bp
@@ -13,7 +13,6 @@
 
     host_supported: true,
 
-    cpp_std: "gnu++17",
     cflags: [
         "-Wall",
         "-Werror",