summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-01-10 11:12:00 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-10 11:12:00 -0800
commit3b0a3b560b56cf5726aabd8b98e6e964adcd6170 (patch)
tree6ccbca5a2a0f2ff0d0fa3a946a2dc48931d304b6
parent0b32fa6f0fb42306826359061a41a1d2d5189f76 (diff)
parent9e1b16b3aecab5fb30317f6fa6d240ff357131cf (diff)
Merge "Fix -Wreorder-init-list" into main am: 9e1b16b3ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3446828 Change-Id: Ica76d3663df188dc440469bf50e71f33e4317d6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/incremental/IncrementalService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index a8e6f689b424..dae481a3c215 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -1999,9 +1999,9 @@ bool IncrementalService::configureNativeBinaries(StorageId storage, std::string_
// Create new lib file without signature info
incfs::NewFileParams libFileParams = {
.size = entry.uncompressed_length,
- .signature = {},
// Metadata of the new lib file is its relative path
.metadata = {targetLibPath.c_str(), (IncFsSize)targetLibPath.size()},
+ .signature = {},
};
incfs::FileId libFileId = idFromMetadata(targetLibPath);
if (auto res = mIncFs->makeFile(ifs->control, targetLibPathAbsolute, 0755, libFileId,