openkylin
/
android-platform-frameworks-base
mirror of https://gitee.com/openkylin/android-platform-frameworks-base.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
luoyaoming 2024-05-06 16:26:18 +08:00
parent 1a3f7064ea
commit a762c29923
5 changed files with 74 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/patches/aapt_typo.diff vendored
View File

@ -1,9 +1,17 @@
Description: Fix a typo
Author: Kai-Chung Yan (殷啟聰)
From: openKylin Developers <packaging@lists.openkylin.top>
Date: Mon, 6 May 2024 16:26:18 +0800
Subject: Fix a typo
Last-Update: 2016-01-10
---
tools/aapt/StringPool.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp
index 6cacd32..bb1d061 100644
--- a/tools/aapt/StringPool.cpp
+++ b/tools/aapt/StringPool.cpp
@@ -40,7 +40,7 @@
@@ -40,7 +40,7 @@ void strcpy16_htod(uint16_t* dst, const char16_t* src)
void printStringPool(const ResStringPool* pool)
{
if (pool->getError() == NO_INIT) {

13
debian/patches/add-missing-headers.patch vendored
View File

@ -1,4 +1,15 @@
From: openKylin Developers <packaging@lists.openkylin.top>
Date: Mon, 6 May 2024 16:26:18 +0800
Subject: add-missing-headers
Forwarded: not-needed
---
tools/aapt2/AppInfo.h | 2 ++
tools/aapt2/cmd/Command.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/tools/aapt2/AppInfo.h b/tools/aapt2/AppInfo.h
index cabbe7e..15461a3 100644
--- a/tools/aapt2/AppInfo.h
+++ b/tools/aapt2/AppInfo.h
@@ -21,6 +21,8 @@
@ -10,6 +21,8 @@ Forwarded: not-needed
namespace aapt {
// Information relevant to building an app, parsed from the app's AndroidManifest.xml.
diff --git a/tools/aapt2/cmd/Command.h b/tools/aapt2/cmd/Command.h
index 8678cda..5841b35 100644
--- a/tools/aapt2/cmd/Command.h
+++ b/tools/aapt2/cmd/Command.h
@@ -18,6 +18,7 @@

23
debian/patches/fix-compile-error.patch vendored
View File

@ -1,8 +1,19 @@
Description: fix std::vector must have a non-const, non-volatile value_type
From: openKylin Developers <packaging@lists.openkylin.top>
Date: Mon, 6 May 2024 16:26:18 +0800
Subject: fix std::vector must have a non-const, non-volatile value_type
Forwarded: not-needed
---
libs/androidfw/include/androidfw/LoadedArsc.h | 2 +-
tools/aapt2/util/Files.cpp | 2 +-
tools/aapt2/util/Files.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libs/androidfw/include/androidfw/LoadedArsc.h b/libs/androidfw/include/androidfw/LoadedArsc.h
index b3d6a4d..76e3e7f 100644
--- a/libs/androidfw/include/androidfw/LoadedArsc.h
+++ b/libs/androidfw/include/androidfw/LoadedArsc.h
@@ -295,7 +295,7 @@
@@ -295,7 +295,7 @@ class LoadedPackage {
std::unordered_map<uint8_t, TypeSpec> type_specs_;
ByteBucketArray<uint32_t> resource_ids_;
std::vector<DynamicPackageEntry> dynamic_package_map_;
@ -11,9 +22,11 @@ Forwarded: not-needed
std::map<uint32_t, uint32_t> alias_id_map_;
// A map of overlayable name to actor
diff --git a/tools/aapt2/util/Files.cpp b/tools/aapt2/util/Files.cpp
index 3285d8b..aacbff0 100644
--- a/tools/aapt2/util/Files.cpp
+++ b/tools/aapt2/util/Files.cpp
@@ -189,7 +189,7 @@
@@ -189,7 +189,7 @@ void AppendPath(std::string* base, StringPiece part) {
base->append(part.data(), part.size());
}
@ -22,9 +35,11 @@ Forwarded: not-needed
if (args.empty()) {
return "";
}
diff --git a/tools/aapt2/util/Files.h b/tools/aapt2/util/Files.h
index a2b1b58..ea8dd36 100644
--- a/tools/aapt2/util/Files.h
+++ b/tools/aapt2/util/Files.h
@@ -59,7 +59,7 @@
@@ -61,7 +61,7 @@ FileType GetFileType(const std::string& path);
void AppendPath(std::string* base, android::StringPiece part);
// Concatenates the list of paths and separates each part with the directory separator.

22
debian/patches/fix-proto-import-paths.patch vendored
View File

@ -1,7 +1,17 @@
Description: fix proto import paths, this dir layout is different
From: openKylin Developers <packaging@lists.openkylin.top>
Date: Mon, 6 May 2024 16:26:18 +0800
Subject: fix proto import paths, this dir layout is different
Forwarded: not-needed
--- android-platform-frameworks-base-10.0.0+r36.orig/tools/aapt2/Resources.proto
+++ android-platform-frameworks-base-10.0.0+r36/tools/aapt2/Resources.proto
---
tools/aapt2/Resources.proto | 2 +-
tools/aapt2/ResourcesInternal.proto | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/aapt2/Resources.proto b/tools/aapt2/Resources.proto
index 95b7949..be363bc 100644
--- a/tools/aapt2/Resources.proto
+++ b/tools/aapt2/Resources.proto
@@ -16,7 +16,7 @@
syntax = "proto3";
@ -11,8 +21,10 @@ Forwarded: not-needed
package aapt.pb;
--- android-platform-frameworks-base-10.0.0+r36.orig/tools/aapt2/ResourcesInternal.proto
+++ android-platform-frameworks-base-10.0.0+r36/tools/aapt2/ResourcesInternal.proto
diff --git a/tools/aapt2/ResourcesInternal.proto b/tools/aapt2/ResourcesInternal.proto
index b0ed3da..97aa5af 100644
--- a/tools/aapt2/ResourcesInternal.proto
+++ b/tools/aapt2/ResourcesInternal.proto
@@ -16,8 +16,8 @@
syntax = "proto3";

15
debian/patches/hard-code-versions.patch vendored
View File

@ -1,3 +1,14 @@
From: openKylin Developers <packaging@lists.openkylin.top>
Date: Mon, 6 May 2024 16:26:17 +0800
Subject: hard-code-versions
---
tools/aapt/Main.cpp | 3 +--
tools/aapt2/util/Util.cpp | 13 +------------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp
index 2f2ef92..ab98db3 100644
--- a/tools/aapt/Main.cpp
+++ b/tools/aapt/Main.cpp
@@ -6,7 +6,6 @@
@ -8,7 +19,7 @@
#include <utils/Compat.h>
#include <utils/Log.h>
#include <utils/threads.h>
@@ -29,7 +28,7 @@
@@ -29,7 +28,7 @@ int doVersion(Bundle* bundle)
if (bundle->getFileSpecCount() != 0) {
printf("(ignoring extra arguments)\n");
}
@ -17,6 +28,8 @@
return 0;
}
diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp
index efbbf8e..5309f0a 100644
--- a/tools/aapt2/util/Util.cpp
+++ b/tools/aapt2/util/Util.cpp
@@ -24,7 +24,6 @@