ReVanced-Mirror
/
aapt2
mirror of https://github.com/revanced/aapt2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: move patches to appropriate file [skip-ci]

This commit is contained in:
oSumAtrIX 2022-09-24 16:09:58 +02:00
parent 0f54c42919
commit e7e682a132
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/aapt2.patch
View File

@ -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

43
patches/androidfw.patch
View File

@ -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_;
}
return data_;