Bug#1012890: android-platform-frameworks-base: ftbfs with GCC-12

[Jochen Sprickerhof]

* Roger Shimizu <r...@debian.org> [2023-02-09 13:42]:

Please try the version in experimental.
and also refer the version info of this ticket:

Found in versions android-platform-frameworks-base/1:10.0.0+r36-5,
android-platform-frameworks-base/13~beta3-1~exp1
Fixed in version android-platform-frameworks-base/1:10.0.0+r36-6

Cheers Jochen

From: Jochen Sprickerhof <jspri...@debian.org>
Date: Fri, 10 Feb 2023 11:46:23 +0100
Subject: Implement const_iterator::operator--

Needed for
android-platform-frameworks-base/libs/androidfw/LoadedArsc.cpp
when compiling against libstdc++.
---
 .../incremental_delivery/incfs/util/include/util/map_ptr.h   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/system/incremental_delivery/incfs/util/include/util/map_ptr.h b/system/incremental_delivery/incfs/util/include/util/map_ptr.h
index 304540f..836b320 100644
--- a/system/incremental_delivery/incfs/util/include/util/map_ptr.h
+++ b/system/incremental_delivery/incfs/util/include/util/map_ptr.h
@@ -180,6 +180,11 @@ public:
             return *this;
         }
 
+        const const_iterator& operator--() {
+            safe_ptr_--;
+            return *this;
+        }
+
         const_iterator& operator+=(int n) {
             safe_ptr_ = safe_ptr_ + n;
             return *this;
@@ -321,6 +326,13 @@ public:
         return temp;
     }
 
+    template <typename T1 = T, NotVoid<T1> = 0>
+    const map_ptr<T1>& operator--() {
+        LIBINCFS_MAP_PTR_DEBUG_CODE(verified_ = false);
+        --ptr_;
+        return *this;
+    }
+
     template <typename S, typename T1 = T, NotVoid<T1> = 0>
     map_ptr<T1> operator+(const S n) const {
         return map_ptr<T1>(map_, ptr_ + n, verified_block_);

Oups, sorry. The attached patch against android-platform-tools fixes the issue for me.

signature.asc
Description: PGP signature