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

changed debian/source/format to native

This commit is contained in:
luoyaoming 2024-05-06 16:26:18 +08:00
parent eb3b106c23
commit 1182767459
7 changed files with 1 additions and 151 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,14 +0,0 @@
Description: Fix a typo
Author: Kai-Chung Yan (殷啟聰)
Last-Update: 2016-01-10
--- a/tools/aapt/StringPool.cpp
+++ b/tools/aapt/StringPool.cpp
@@ -40,7 +40,7 @@
void printStringPool(const ResStringPool* pool)
{
if (pool->getError() == NO_INIT) {
- printf("String pool is unitialized.\n");
+ printf("String pool is uninitialized.\n");
return;
} else if (pool->getError() != NO_ERROR) {
printf("String pool is corrupt/invalid.\n");

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

@ -1,22 +0,0 @@
Forwarded: not-needed
--- a/tools/aapt2/AppInfo.h
+++ b/tools/aapt2/AppInfo.h
@@ -21,6 +21,8 @@
#include <set>
#include <string>
+#include <stdint.h>
+
namespace aapt {
// Information relevant to building an app, parsed from the app's AndroidManifest.xml.
--- a/tools/aapt2/cmd/Command.h
+++ b/tools/aapt2/cmd/Command.h
@@ -18,6 +18,7 @@
#define AAPT_COMMAND_H
#include <functional>
+#include <memory>
#include <optional>
#include <ostream>
#include <string>

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

@ -1,35 +0,0 @@
Description: fix std::vector must have a non-const, non-volatile value_type
Forwarded: not-needed
--- a/libs/androidfw/include/androidfw/LoadedArsc.h
+++ b/libs/androidfw/include/androidfw/LoadedArsc.h
@@ -295,7 +295,7 @@
std::unordered_map<uint8_t, TypeSpec> type_specs_;
ByteBucketArray<uint32_t> resource_ids_;
std::vector<DynamicPackageEntry> dynamic_package_map_;
- std::vector<const std::pair<OverlayableInfo, std::unordered_set<uint32_t>>> overlayable_infos_;
+ std::vector<std::pair<OverlayableInfo, std::unordered_set<uint32_t>>> overlayable_infos_;
std::map<uint32_t, uint32_t> alias_id_map_;
// A map of overlayable name to actor
--- a/tools/aapt2/util/Files.cpp
+++ b/tools/aapt2/util/Files.cpp
@@ -189,7 +189,7 @@
base->append(part.data(), part.size());
}
-std::string BuildPath(std::vector<const StringPiece>&& args) {
+std::string BuildPath(std::vector<StringPiece>&& args) {
if (args.empty()) {
return "";
}
--- a/tools/aapt2/util/Files.h
+++ b/tools/aapt2/util/Files.h
@@ -59,7 +59,7 @@
void AppendPath(std::string* base, android::StringPiece part);
// Concatenates the list of paths and separates each part with the directory separator.
-std::string BuildPath(std::vector<const android::StringPiece>&& args);
+std::string BuildPath(std::vector<android::StringPiece>&& args);
// Makes all the directories in `path`. The last element in the path is interpreted as a directory.
bool mkdirs(const std::string& path);

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

@ -1,26 +0,0 @@
Description: 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
@@ -16,7 +16,7 @@
syntax = "proto3";
-import "frameworks/base/tools/aapt2/Configuration.proto";
+import "Configuration.proto";
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
@@ -16,8 +16,8 @@
syntax = "proto3";
-import "frameworks/base/tools/aapt2/Configuration.proto";
-import "frameworks/base/tools/aapt2/Resources.proto";
+import "Configuration.proto";
+import "Resources.proto";
package aapt.pb.internal;

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

@ -1,48 +0,0 @@
--- a/tools/aapt/Main.cpp
+++ b/tools/aapt/Main.cpp
@@ -6,7 +6,6 @@
#include "Main.h"
#include "Bundle.h"
-#include <build/version.h>
#include <utils/Compat.h>
#include <utils/Log.h>
#include <utils/threads.h>
@@ -29,7 +28,7 @@
if (bundle->getFileSpecCount() != 0) {
printf("(ignoring extra arguments)\n");
}
- printf("Android Asset Packaging Tool, v0.2-%s\n", android::build::GetBuildNumber().c_str());
+ printf("Android Asset Packaging Tool, v0.2-%s\n", "debian");
return 0;
}
--- a/tools/aapt2/util/Util.cpp
+++ b/tools/aapt2/util/Util.cpp
@@ -24,7 +24,6 @@
#include "android-base/stringprintf.h"
#include "android-base/strings.h"
#include "androidfw/StringPiece.h"
-#include "build/version.h"
#include "text/Unicode.h"
#include "text/Utf8Iterator.h"
#include "util/BigBuffer.h"
@@ -230,17 +229,7 @@ std::string GetToolFingerprint() {
// Update minor version whenever a feature or flag is added.
static const char* const sMinorVersion = "19";
- // The build id of aapt2 binary.
- static std::string sBuildId = android::build::GetBuildNumber();
-
- if (android::base::StartsWith(sBuildId, "eng.")) {
- time_t now = time(0);
- tm* ltm = localtime(&now);
-
- sBuildId = android::base::StringPrintf("eng.%d%d", 1900 + ltm->tm_year, 1 + ltm->tm_mon);
- }
-
- return android::base::StringPrintf("%s.%s-%s", sMajorVersion, sMinorVersion, sBuildId.c_str());
+ return android::base::StringPrintf("%s.%s-%s", sMajorVersion, sMinorVersion, "debian");
}
static size_t ConsumeDigits(const char* start, const char* end) {

5
debian/patches/series vendored
View File

@ -1,5 +0,0 @@
hard-code-versions.patch
aapt_typo.diff
fix-compile-error.patch
fix-proto-import-paths.patch
add-missing-headers.patch

2
debian/source/format vendored
View File

@ -1 +1 @@
3.0 (quilt)
3.0 (native)