Support binary pb format for manifest in apexd.
For now, fall back to the JSON version if the manifest.pb file is not
present. This is an intermediate step until all prebuilts are recompiled
to contain the manifest.pb.
Bug: 143654022
Test: CtsStagedInstallHostTestCases
Change-Id: I5cfc69198ccc3085d27623251286aa97a4aadc98
diff --git a/apexd/apex_file.cpp b/apexd/apex_file.cpp
index 10a987b..13e76f3 100644
--- a/apexd/apex_file.cpp
+++ b/apexd/apex_file.cpp
@@ -85,10 +85,19 @@
image_offset = entry.offset;
image_size = entry.uncompressed_length;
- ret = FindEntry(handle, kManifestFilename, &entry);
+ ret = FindEntry(handle, kManifestFilenamePb, &entry);
+ bool isJsonManifest = false;
if (ret < 0) {
- return Error() << "Could not find entry \"" << kManifestFilename
- << "\" in package " << path << ": " << ErrorCodeString(ret);
+ LOG(ERROR) << "Could not find entry \"" << kManifestFilenamePb
+ << "\" in package " << path << ": " << ErrorCodeString(ret);
+ LOG(ERROR) << "Falling back to JSON if present.";
+ isJsonManifest = true;
+ ret = FindEntry(handle, kManifestFilenameJson, &entry);
+ if (ret < 0) {
+ return Error() << "Could not find entry \"" << kManifestFilenameJson
+ << "\" in package " << path << ": "
+ << ErrorCodeString(ret);
+ }
}
uint32_t length = entry.uncompressed_length;
@@ -114,7 +123,12 @@
}
}
- Result<ApexManifest> manifest = ParseManifest(manifest_content);
+ Result<ApexManifest> manifest;
+ if (isJsonManifest) {
+ manifest = ParseManifestJson(manifest_content);
+ } else {
+ manifest = ParseManifest(manifest_content);
+ }
if (!manifest) {
return manifest.error();
}
@@ -376,16 +390,17 @@
Result<void> ApexFile::VerifyManifestMatches(
const std::string& mount_path) const {
- std::string manifest_content;
- const std::string manifest_path = mount_path + "/" + kManifestFilename;
-
- if (!android::base::ReadFileToString(manifest_path, &manifest_content)) {
- return Error() << "Failed to read manifest file: " << manifest_path;
- }
-
- Result<ApexManifest> verifiedManifest = ParseManifest(manifest_content);
+ Result<ApexManifest> verifiedManifest =
+ ReadManifest(mount_path + "/" + kManifestFilenamePb);
if (!verifiedManifest) {
- return verifiedManifest.error();
+ LOG(ERROR) << "Could not read manifest from " << mount_path << "/"
+ << kManifestFilenamePb << " : " << verifiedManifest.error();
+ // Fallback to Json manifest if present.
+ LOG(ERROR) << "Trying to find a JSON manifest";
+ verifiedManifest = ReadManifest(mount_path + "/" + kManifestFilenameJson);
+ if (!verifiedManifest) {
+ return verifiedManifest.error();
+ }
}
if (!MessageDifferencer::Equals(manifest_, *verifiedManifest)) {
