0f76311c1d
Introduce a new type Result<T> to indicate if an operation succeeded or not, and if it did, to hold the return value of the operation. This is the same as how std::pair<bool, T> is already used in the codebase, so replace all instances with Result<T> to improve clarity. Result<T> is simply an alias for std::optional<T>. The difference is semantic: use Result<T> as the return value for functions that can fail, use std::optional<T> when values are truly optional. This is modelled after Rust's std::result and std::option. A future change may graduate Result<T> to a proper class which can hold additional details on why an operation failed, such as a string or an error code. As a special case, continue to use std::unique_ptr<T> instead of Result<std::unique_ptr<T>> for now: the latter would increase code complexity without added benefit. Test: make idmap2_tests Change-Id: I2a8355107ed2b6485409e5e655a84cf1e20b9911
77 lines
2.4 KiB
C++
77 lines
2.4 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <string>
|
|
|
|
#include "android-base/macros.h"
|
|
#include "android-base/stringprintf.h"
|
|
#include "androidfw/ApkAssets.h"
|
|
|
|
#include "idmap2/PrettyPrintVisitor.h"
|
|
#include "idmap2/ResourceUtils.h"
|
|
#include "idmap2/Result.h"
|
|
|
|
namespace android {
|
|
namespace idmap2 {
|
|
|
|
#define RESID(pkg, type, entry) (((pkg) << 24) | ((type) << 16) | (entry))
|
|
|
|
void PrettyPrintVisitor::visit(const Idmap& idmap ATTRIBUTE_UNUSED) {
|
|
}
|
|
|
|
void PrettyPrintVisitor::visit(const IdmapHeader& header) {
|
|
stream_ << "target apk path : " << header.GetTargetPath() << std::endl
|
|
<< "overlay apk path : " << header.GetOverlayPath() << std::endl;
|
|
|
|
target_apk_ = ApkAssets::Load(header.GetTargetPath().to_string());
|
|
if (target_apk_) {
|
|
target_am_.SetApkAssets({target_apk_.get()});
|
|
}
|
|
}
|
|
|
|
void PrettyPrintVisitor::visit(const IdmapData& data ATTRIBUTE_UNUSED) {
|
|
}
|
|
|
|
void PrettyPrintVisitor::visit(const IdmapData::Header& header ATTRIBUTE_UNUSED) {
|
|
last_seen_package_id_ = header.GetTargetPackageId();
|
|
}
|
|
|
|
void PrettyPrintVisitor::visit(const IdmapData::TypeEntry& te) {
|
|
const bool target_package_loaded = !target_am_.GetApkAssets().empty();
|
|
for (uint16_t i = 0; i < te.GetEntryCount(); i++) {
|
|
const EntryId entry = te.GetEntry(i);
|
|
if (entry == kNoEntry) {
|
|
continue;
|
|
}
|
|
|
|
const ResourceId target_resid =
|
|
RESID(last_seen_package_id_, te.GetTargetTypeId(), te.GetEntryOffset() + i);
|
|
const ResourceId overlay_resid = RESID(last_seen_package_id_, te.GetOverlayTypeId(), entry);
|
|
|
|
stream_ << base::StringPrintf("0x%08x -> 0x%08x", target_resid, overlay_resid);
|
|
if (target_package_loaded) {
|
|
Result<std::string> name = utils::ResToTypeEntryName(target_am_, target_resid);
|
|
if (name) {
|
|
stream_ << " " << *name;
|
|
}
|
|
}
|
|
stream_ << std::endl;
|
|
}
|
|
}
|
|
|
|
} // namespace idmap2
|
|
} // namespace android
|