From 352ee824001a116976b8e189558e850fc09c021b Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Sat, 24 Sep 2022 14:50:53 +0200
Subject: [PATCH] refactor: split patches to separate files

---
 patches/aapt2.patch     | 45 +------------------------------------
 patches/androidfw.patch | 50 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 44 deletions(-)
 create mode 100644 patches/androidfw.patch

diff --git a/patches/aapt2.patch b/patches/aapt2.patch
index 0bf6295..f884571 100644
--- a/patches/aapt2.patch
+++ b/patches/aapt2.patch
@@ -12,49 +12,6 @@ index cae2d0bc16b3..13c5f8fc84e8 100644
  #include <binder/TextOutput.h>
  
  #endif
-diff --git a/src/base/libs/androidfw/include/androidfw/StringPiece.h b/src/base/libs/androidfw/include/androidfw/StringPiece.h
-index 921877dc4982..27e27e1c2b94 100644
---- a/src/base/libs/androidfw/include/androidfw/StringPiece.h
-+++ b/src/base/libs/androidfw/include/androidfw/StringPiece.h
-@@ -75,6 +75,11 @@ class BasicStringPiece {
-   bool operator>(const BasicStringPiece<TChar>& rhs) const;
-   bool operator==(const BasicStringPiece<TChar>& rhs) const;
-   bool operator!=(const BasicStringPiece<TChar>& rhs) const;
-+  // for std::basic_string
-+  bool operator<(const std::basic_string<TChar>& rhs) const;
-+  bool operator>(const std::basic_string<TChar>& rhs) const;
-+  bool operator==(const std::basic_string<TChar>& rhs) const;
-+  bool operator!=(const std::basic_string<TChar>& rhs) const;
- 
-   const_iterator begin() const;
-   const_iterator end() const;
-@@ -256,6 +261,26 @@ inline bool BasicStringPiece<TChar>::operator!=(const BasicStringPiece<TChar>& r
-   return compare(rhs) != 0;
- }
- 
-+template <typename TChar>
-+inline bool BasicStringPiece<TChar>::operator<(const std::basic_string<TChar>& rhs) const {
-+    return compare(BasicStringPiece(rhs)) < 0;
-+}
-+
-+template <typename TChar>
-+inline bool BasicStringPiece<TChar>::operator>(const std::basic_string<TChar>& rhs) const {
-+    return compare(BasicStringPiece(rhs)) > 0;
-+}
-+
-+template <typename TChar>
-+inline bool BasicStringPiece<TChar>::operator==(const std::basic_string<TChar>& rhs) const {
-+    return compare(BasicStringPiece(rhs)) == 0;
-+}
-+
-+template <typename TChar>
-+inline bool BasicStringPiece<TChar>::operator!=(const std::basic_string<TChar>& rhs) const{
-+    return compare(BasicStringPiece(rhs)) != 0;
-+}
-+
- template <typename TChar>
- inline typename BasicStringPiece<TChar>::const_iterator BasicStringPiece<TChar>::begin() const {
-   return data_;
 diff --git a/src/base/tools/aapt2/ResourceTable.cpp b/src/base/tools/aapt2/ResourceTable.cpp
 index 8ab1493c6ab3..3a855f0f6866 100644
 --- a/src/base/tools/aapt2/ResourceTable.cpp
@@ -227,4 +184,4 @@ index d7a8e6fe6ada..74457add2e6b 100644
 +  return android::base::StringPrintf("%s.%s", sMajorVersion, sMinorVersion);
  }
  
- static size_t ConsumeDigits(const char* start, const char* end) {
+ static size_t ConsumeDigits(const char* start, const char* end) {
\ No newline at end of file
diff --git a/patches/androidfw.patch b/patches/androidfw.patch
new file mode 100644
index 0000000..eed7373
--- /dev/null
+++ b/patches/androidfw.patch
@@ -0,0 +1,50 @@
+--- a/base/libs/androidfw/include/androidfw/StringPiece.h	2022-09-24 10:22:22.808291321 +0800
++++ b/base/libs/androidfw/include/androidfw/StringPiece.h	2022-09-24 10:20:04.808277573 +0800
+@@ -68,13 +68,19 @@
+   size_t size() const;
+   bool empty() const;
+   std::basic_string<TChar> to_string() const;
++
+   bool contains(const BasicStringPiece<TChar>& rhs) const;
+   int compare(const BasicStringPiece<TChar>& rhs) const;
+   bool operator<(const BasicStringPiece<TChar>& rhs) const;
+   bool operator>(const BasicStringPiece<TChar>& rhs) const;
+   bool operator==(const BasicStringPiece<TChar>& rhs) const;
+   bool operator!=(const BasicStringPiece<TChar>& rhs) const;
+- 
++  // for std::basic_string
++  bool operator<(const std::basic_string<TChar>& rhs) const;
++  bool operator>(const std::basic_string<TChar>& rhs) const;
++  bool operator==(const std::basic_string<TChar>& rhs) const;
++  bool operator!=(const std::basic_string<TChar>& rhs) const;
++
+   const_iterator begin() const;
+   const_iterator end() const;
+ 
+@@ -256,6 +262,26 @@
+ }
+ 
++ template <typename TChar>
++inline bool BasicStringPiece<TChar>::operator<(const std::basic_string<TChar>& rhs) const {
++    return compare(BasicStringPiece(rhs)) < 0;
++}
++
++template <typename TChar>
++inline bool BasicStringPiece<TChar>::operator>(const std::basic_string<TChar>& rhs) const {
++    return compare(BasicStringPiece(rhs)) > 0;
++}
++
++template <typename TChar>
++inline bool BasicStringPiece<TChar>::operator==(const std::basic_string<TChar>& rhs) const {
++    return compare(BasicStringPiece(rhs)) == 0;
++}
++
++template <typename TChar>
++inline bool BasicStringPiece<TChar>::operator!=(const std::basic_string<TChar>& rhs) const{
++    return compare(BasicStringPiece(rhs)) != 0;
++}
++
+template <typename TChar>
+ inline typename BasicStringPiece<TChar>::const_iterator BasicStringPiece<TChar>::begin() const {
+   return data_;
+ }
\ No newline at end of file