Improve logging of apexd boot sequence
* Log apexes scanned by ApexFileRepository
* Remove log line from ScanApexFiles, since that function also uses
ApexFileRepository
* Log processed compressed apexes
Test: adb logcat
Change-Id: I147b2ec81fbcf6704bdd6928f60b1ea38686b339
diff --git a/apexd/apex_file.cpp b/apexd/apex_file.cpp
index 61e819d..89ff213 100644
--- a/apexd/apex_file.cpp
+++ b/apexd/apex_file.cpp
@@ -410,6 +410,8 @@
Result<void> ApexFile::Decompress(const std::string& dest_path) const {
const std::string& src_path = GetPath();
+ LOG(INFO) << "Decompressing" << src_path << " to " << dest_path;
+
// We should decompress compressed APEX files only
if (!IsCompressed()) {
return ErrnoError() << "Cannot decompress an uncompressed APEX";
diff --git a/apexd/apex_file_repository.cpp b/apexd/apex_file_repository.cpp
index e4fb6ac..3e530b5 100644
--- a/apexd/apex_file_repository.cpp
+++ b/apexd/apex_file_repository.cpp
@@ -54,6 +54,7 @@
// TODO(b/179248390): scan parallelly if possible
for (const auto& file : *all_apex_files) {
+ LOG(INFO) << "Found pre-installed APEX " << file;
Result<ApexFile> apex_file = ApexFile::Open(file);
if (!apex_file.ok()) {
return Error() << "Failed to open " << file << " : " << apex_file.error();
@@ -189,6 +190,7 @@
// TODO(b/179248390): scan parallelly if possible
for (const auto& file : *all_apex_files) {
+ LOG(INFO) << "Found updated apex " << file;
Result<ApexFile> apex_file = ApexFile::Open(file);
if (!apex_file.ok()) {
LOG(ERROR) << "Failed to open " << file << " : " << apex_file.error();
diff --git a/apexd/apexd.cpp b/apexd/apexd.cpp
index 4d93732..074667d 100644
--- a/apexd/apexd.cpp
+++ b/apexd/apexd.cpp
@@ -1467,6 +1467,7 @@
namespace {
// TODO(b/179497746): Avoid scanning apex directly here
+// Only used in OnBootstrap. Should we remove this function?
Result<std::vector<ApexFile>> ScanApexFiles(const char* apex_package_dir,
bool include_compressed = false) {
LOG(INFO) << "Scanning " << apex_package_dir << " looking for APEX packages.";
@@ -1486,7 +1487,6 @@
}
std::vector<ApexFile> ret;
for (const auto& name : *scan) {
- LOG(INFO) << "Found " << name;
Result<ApexFile> apex_file = ApexFile::Open(name);
if (!apex_file.ok()) {
LOG(ERROR) << "Failed to scan " << name << " : " << apex_file.error();
@@ -2463,7 +2463,7 @@
if (!apex_file.IsCompressed()) {
continue;
}
-
+ LOG(INFO) << "Processing compressed APEX " << apex_file.GetPath();
// Files to clean up if processing fails for any reason
std::vector<std::string> cleanup;
auto scope_guard = android::base::make_scope_guard([&cleanup] {
