From e7e682a13236535cb23144dbaba6e7e92c8e5526 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Sat, 24 Sep 2022 16:09:58 +0200
Subject: [PATCH] refactor: move patches to appropriate file [skip-ci]

---
 patches/aapt2.patch     | 13 -------------
 patches/androidfw.patch | 43 ++++++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/patches/aapt2.patch b/patches/aapt2.patch
index f884571..a9e3452 100644
--- a/patches/aapt2.patch
+++ b/patches/aapt2.patch
@@ -1,17 +1,4 @@
 Submodule src/base contains modified content
-diff --git a/src/base/libs/androidfw/ResourceTypes.cpp b/src/base/libs/androidfw/ResourceTypes.cpp
-index cae2d0bc16b3..13c5f8fc84e8 100644
---- a/src/base/libs/androidfw/ResourceTypes.cpp
-+++ b/src/base/libs/androidfw/ResourceTypes.cpp
-@@ -43,7 +43,7 @@
- #include <utils/String16.h>
- #include <utils/String8.h>
- 
--#ifdef __ANDROID__
-+#if 0
- #include <binder/TextOutput.h>
- 
- #endif
 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
diff --git a/patches/androidfw.patch b/patches/androidfw.patch
index eed7373..4f99cc5 100644
--- a/patches/androidfw.patch
+++ b/patches/androidfw.patch
@@ -1,30 +1,38 @@
---- 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;
+Submodule src/base contains modified content
+diff --git a/src/base/libs/androidfw/ResourceTypes.cpp b/src/base/libs/androidfw/ResourceTypes.cpp
+index cae2d0bc16b3..13c5f8fc84e8 100644
+--- a/src/base/libs/androidfw/ResourceTypes.cpp
++++ b/src/base/libs/androidfw/ResourceTypes.cpp
+@@ -43,7 +43,7 @@
+ #include <utils/String16.h>
+ #include <utils/String8.h>
+ 
+-#ifdef __ANDROID__
++#if 0
+ #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 +262,26 @@
+@@ -256,6 +261,26 @@ inline bool BasicStringPiece<TChar>::operator!=(const BasicStringPiece<TChar>& r
+   return compare(rhs) != 0;
  }
  
-+ template <typename TChar>
++template <typename TChar>
 +inline bool BasicStringPiece<TChar>::operator<(const std::basic_string<TChar>& rhs) const {
 +    return compare(BasicStringPiece(rhs)) < 0;
 +}
@@ -44,7 +52,6 @@
 +    return compare(BasicStringPiece(rhs)) != 0;
 +}
 +
-template <typename TChar>
+ template <typename TChar>
  inline typename BasicStringPiece<TChar>::const_iterator BasicStringPiece<TChar>::begin() const {
-   return data_;
- }
\ No newline at end of file
+   return data_;
\ No newline at end of file