Idmap format changes for bidirectional lookup
This change modifies the idmap file format to allow for target resources
to map to arbitrary type/value combinations and to allow overlay
resources to be mapped back to target resource ids so references to
overlay resources can appear as references to target resources at
runtime.
The mappings of target resources to overlay resources and vice-versa are
both encoded as sparse arrays. Instead of looking up a resource by
indexing into an array that maps to the overlay resource id, the runtime
will binary search over the sparse array to find the type and value that
overlays the target resource.
Bug: 135943783
Test: idmap2_tests
Change-Id: I5d5344cdb7fe35f4f2e8d6781016299dea5d1e20
diff --git a/cmds/idmap2/libidmap2/BinaryStreamVisitor.cpp b/cmds/idmap2/libidmap2/BinaryStreamVisitor.cpp
index dee2d21..3b0940a 100644
--- a/cmds/idmap2/libidmap2/BinaryStreamVisitor.cpp
+++ b/cmds/idmap2/libidmap2/BinaryStreamVisitor.cpp
@@ -24,6 +24,14 @@
namespace android::idmap2 {
+void BinaryStreamVisitor::Write(const void* value, size_t length) {
+ stream_.write(reinterpret_cast<const char*>(value), length);
+}
+
+void BinaryStreamVisitor::Write8(uint8_t value) {
+ stream_.write(reinterpret_cast<char*>(&value), sizeof(uint8_t));
+}
+
void BinaryStreamVisitor::Write16(uint16_t value) {
uint16_t x = htodl(value);
stream_.write(reinterpret_cast<char*>(&x), sizeof(uint16_t));
@@ -54,26 +62,28 @@
WriteString(header.GetOverlayPath());
}
-void BinaryStreamVisitor::visit(const IdmapData& data ATTRIBUTE_UNUSED) {
- // nothing to do
+void BinaryStreamVisitor::visit(const IdmapData& data) {
+ for (const auto& target_entry : data.GetTargetEntries()) {
+ Write32(target_entry.target_id);
+ Write8(target_entry.data_type);
+ Write32(target_entry.data_value);
+ }
+
+ for (const auto& overlay_entry : data.GetOverlayEntries()) {
+ Write32(overlay_entry.overlay_id);
+ Write32(overlay_entry.target_id);
+ }
+
+ Write(data.GetStringPoolData(), data.GetHeader()->GetStringPoolLength());
}
void BinaryStreamVisitor::visit(const IdmapData::Header& header) {
- Write16(header.GetTargetPackageId());
- Write16(header.GetTypeCount());
-}
-
-void BinaryStreamVisitor::visit(const IdmapData::TypeEntry& type_entry) {
- const uint16_t entryCount = type_entry.GetEntryCount();
-
- Write16(type_entry.GetTargetTypeId());
- Write16(type_entry.GetOverlayTypeId());
- Write16(entryCount);
- Write16(type_entry.GetEntryOffset());
- for (uint16_t i = 0; i < entryCount; i++) {
- EntryId entry_id = type_entry.GetEntry(i);
- Write32(entry_id != kNoEntry ? static_cast<uint32_t>(entry_id) : kPadding);
- }
+ Write8(header.GetTargetPackageId());
+ Write8(header.GetOverlayPackageId());
+ Write32(header.GetTargetEntryCount());
+ Write32(header.GetOverlayEntryCount());
+ Write32(header.GetStringPoolIndexOffset());
+ Write32(header.GetStringPoolLength());
}
} // namespace android::idmap2
diff --git a/cmds/idmap2/libidmap2/Idmap.cpp b/cmds/idmap2/libidmap2/Idmap.cpp
index 389ade5..5cb91d7 100644
--- a/cmds/idmap2/libidmap2/Idmap.cpp
+++ b/cmds/idmap2/libidmap2/Idmap.cpp
@@ -42,30 +42,10 @@
namespace {
-class MatchingResources {
- public:
- void Add(ResourceId target_resid, ResourceId overlay_resid) {
- TypeId target_typeid = EXTRACT_TYPE(target_resid);
- if (map_.find(target_typeid) == map_.end()) {
- map_.emplace(target_typeid, std::set<std::pair<ResourceId, ResourceId>>());
- }
- map_[target_typeid].insert(std::make_pair(target_resid, overlay_resid));
- }
-
- inline const std::map<TypeId, std::set<std::pair<ResourceId, ResourceId>>>& WARN_UNUSED
- Map() const {
- return map_;
- }
-
- private:
- // target type id -> set { pair { overlay entry id, overlay entry id } }
- std::map<TypeId, std::set<std::pair<ResourceId, ResourceId>>> map_;
-};
-
-bool WARN_UNUSED Read16(std::istream& stream, uint16_t* out) {
- uint16_t value;
- if (stream.read(reinterpret_cast<char*>(&value), sizeof(uint16_t))) {
- *out = dtohl(value);
+bool WARN_UNUSED Read8(std::istream& stream, uint8_t* out) {
+ uint8_t value;
+ if (stream.read(reinterpret_cast<char*>(&value), sizeof(uint8_t))) {
+ *out = value;
return true;
}
return false;
@@ -80,6 +60,15 @@
return false;
}
+bool WARN_UNUSED ReadBuffer(std::istream& stream, std::unique_ptr<uint8_t[]>* out, size_t length) {
+ auto buffer = std::unique_ptr<uint8_t[]>(new uint8_t[length]);
+ if (stream.read(reinterpret_cast<char*>(buffer.get()), length)) {
+ *out = std::move(buffer);
+ return true;
+ }
+ return false;
+}
+
// a string is encoded as a kIdmapStringLength char array; the array is always null-terminated
bool WARN_UNUSED ReadString(std::istream& stream, char out[kIdmapStringLength]) {
char buf[kIdmapStringLength];
@@ -162,51 +151,48 @@
std::unique_ptr<const IdmapData::Header> IdmapData::Header::FromBinaryStream(std::istream& stream) {
std::unique_ptr<IdmapData::Header> idmap_data_header(new IdmapData::Header());
- uint16_t target_package_id16;
- if (!Read16(stream, &target_package_id16) || !Read16(stream, &idmap_data_header->type_count_)) {
+ if (!Read8(stream, &idmap_data_header->target_package_id_) ||
+ !Read8(stream, &idmap_data_header->overlay_package_id_) ||
+ !Read32(stream, &idmap_data_header->target_entry_count) ||
+ !Read32(stream, &idmap_data_header->overlay_entry_count) ||
+ !Read32(stream, &idmap_data_header->string_pool_index_offset) ||
+ !Read32(stream, &idmap_data_header->string_pool_len)) {
return nullptr;
}
- idmap_data_header->target_package_id_ = target_package_id16;
return std::move(idmap_data_header);
}
-std::unique_ptr<const IdmapData::TypeEntry> IdmapData::TypeEntry::FromBinaryStream(
- std::istream& stream) {
- std::unique_ptr<IdmapData::TypeEntry> data(new IdmapData::TypeEntry());
- uint16_t target_type16;
- uint16_t overlay_type16;
- uint16_t entry_count;
- if (!Read16(stream, &target_type16) || !Read16(stream, &overlay_type16) ||
- !Read16(stream, &entry_count) || !Read16(stream, &data->entry_offset_)) {
- return nullptr;
- }
- data->target_type_id_ = target_type16;
- data->overlay_type_id_ = overlay_type16;
- for (uint16_t i = 0; i < entry_count; i++) {
- ResourceId resid;
- if (!Read32(stream, &resid)) {
- return nullptr;
- }
- data->entries_.push_back(resid);
- }
-
- return std::move(data);
-}
-
std::unique_ptr<const IdmapData> IdmapData::FromBinaryStream(std::istream& stream) {
std::unique_ptr<IdmapData> data(new IdmapData());
data->header_ = IdmapData::Header::FromBinaryStream(stream);
if (!data->header_) {
return nullptr;
}
- for (size_t type_count = 0; type_count < data->header_->GetTypeCount(); type_count++) {
- std::unique_ptr<const TypeEntry> type = IdmapData::TypeEntry::FromBinaryStream(stream);
- if (!type) {
+ // Read the mapping of target resource id to overlay resource value.
+ for (size_t i = 0; i < data->header_->GetTargetEntryCount(); i++) {
+ TargetEntry target_entry{};
+ if (!Read32(stream, &target_entry.target_id) || !Read8(stream, &target_entry.data_type) ||
+ !Read32(stream, &target_entry.data_value)) {
return nullptr;
}
- data->type_entries_.push_back(std::move(type));
+ data->target_entries_.emplace_back(target_entry);
}
+
+ // Read the mapping of overlay resource id to target resource id.
+ for (size_t i = 0; i < data->header_->GetOverlayEntryCount(); i++) {
+ OverlayEntry overlay_entry{};
+ if (!Read32(stream, &overlay_entry.overlay_id) || !Read32(stream, &overlay_entry.target_id)) {
+ return nullptr;
+ }
+ data->overlay_entries_.emplace_back(overlay_entry);
+ }
+
+ // Read raw string pool bytes.
+ if (!ReadBuffer(stream, &data->string_pool_, data->header_->string_pool_len)) {
+ return nullptr;
+ }
+
return std::move(data);
}
@@ -247,40 +233,28 @@
return Error("no resources were overlaid");
}
- MatchingResources matching_resources;
- for (const auto mapping : resource_mapping.GetTargetToOverlayMap()) {
- if (mapping.second.data_type != Res_value::TYPE_REFERENCE) {
- // The idmap format must change to support non-references.
- continue;
- }
-
- matching_resources.Add(mapping.first, mapping.second.data_value);
+ std::unique_ptr<IdmapData> data(new IdmapData());
+ for (const auto& mappings : resource_mapping.GetTargetToOverlayMap()) {
+ data->target_entries_.emplace_back(IdmapData::TargetEntry{
+ mappings.first, mappings.second.data_type, mappings.second.data_value});
}
- // encode idmap data
- std::unique_ptr<IdmapData> data(new IdmapData());
- const auto types_end = matching_resources.Map().cend();
- for (auto ti = matching_resources.Map().cbegin(); ti != types_end; ++ti) {
- auto ei = ti->second.cbegin();
- std::unique_ptr<IdmapData::TypeEntry> type(new IdmapData::TypeEntry());
- type->target_type_id_ = EXTRACT_TYPE(ei->first);
- type->overlay_type_id_ = EXTRACT_TYPE(ei->second);
- type->entry_offset_ = EXTRACT_ENTRY(ei->first);
- EntryId last_target_entry = kNoEntry;
- for (; ei != ti->second.cend(); ++ei) {
- if (last_target_entry != kNoEntry) {
- int count = EXTRACT_ENTRY(ei->first) - last_target_entry - 1;
- type->entries_.insert(type->entries_.end(), count, kNoEntry);
- }
- type->entries_.push_back(EXTRACT_ENTRY(ei->second));
- last_target_entry = EXTRACT_ENTRY(ei->first);
- }
- data->type_entries_.push_back(std::move(type));
+ for (const auto& mappings : resource_mapping.GetOverlayToTargetMap()) {
+ data->overlay_entries_.emplace_back(IdmapData::OverlayEntry{mappings.first, mappings.second});
}
std::unique_ptr<IdmapData::Header> data_header(new IdmapData::Header());
data_header->target_package_id_ = resource_mapping.GetTargetPackageId();
- data_header->type_count_ = data->type_entries_.size();
+ data_header->overlay_package_id_ = resource_mapping.GetOverlayPackageId();
+ data_header->target_entry_count = static_cast<uint32_t>(data->target_entries_.size());
+ data_header->overlay_entry_count = static_cast<uint32_t>(data->overlay_entries_.size());
+ data_header->string_pool_index_offset = resource_mapping.GetStringPoolOffset();
+
+ const auto string_pool_data = resource_mapping.GetStringPoolData();
+ data_header->string_pool_len = string_pool_data.second;
+ data->string_pool_ = std::unique_ptr<uint8_t[]>(new uint8_t[data_header->string_pool_len]);
+ memcpy(data->string_pool_.get(), string_pool_data.first, data_header->string_pool_len);
+
data->header_ = std::move(data_header);
return {std::move(data)};
}
@@ -367,25 +341,16 @@
v->visit(*this);
}
-void IdmapData::TypeEntry::accept(Visitor* v) const {
- assert(v != nullptr);
- v->visit(*this);
-}
-
void IdmapData::accept(Visitor* v) const {
assert(v != nullptr);
- v->visit(*this);
header_->accept(v);
- auto end = type_entries_.cend();
- for (auto iter = type_entries_.cbegin(); iter != end; ++iter) {
- (*iter)->accept(v);
- }
+ v->visit(*this);
}
void Idmap::accept(Visitor* v) const {
assert(v != nullptr);
- v->visit(*this);
header_->accept(v);
+ v->visit(*this);
auto end = data_.cend();
for (auto iter = data_.cbegin(); iter != end; ++iter) {
(*iter)->accept(v);
diff --git a/cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp b/cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp
index fbf2c77..a662aa5 100644
--- a/cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp
+++ b/cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp
@@ -41,29 +41,33 @@
}
}
-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& type_entry) {
+void PrettyPrintVisitor::visit(const IdmapData& data) {
const bool target_package_loaded = !target_am_.GetApkAssets().empty();
- for (uint16_t i = 0; i < type_entry.GetEntryCount(); i++) {
- const EntryId entry = type_entry.GetEntry(i);
- if (entry == kNoEntry) {
- continue;
+ const ResStringPool string_pool(data.GetStringPoolData(),
+ data.GetHeader()->GetStringPoolLength());
+ const size_t string_pool_offset = data.GetHeader()->GetStringPoolIndexOffset();
+
+ for (auto& target_entry : data.GetTargetEntries()) {
+ stream_ << base::StringPrintf("0x%08x ->", target_entry.target_id);
+
+ if (target_entry.data_type != Res_value::TYPE_REFERENCE &&
+ target_entry.data_type != Res_value::TYPE_DYNAMIC_REFERENCE) {
+ stream_ << " " << utils::DataTypeToString(target_entry.data_type);
}
- const ResourceId target_resid =
- RESID(last_seen_package_id_, type_entry.GetTargetTypeId(), type_entry.GetEntryOffset() + i);
- const ResourceId overlay_resid =
- RESID(last_seen_package_id_, type_entry.GetOverlayTypeId(), entry);
+ if (target_entry.data_type == Res_value::TYPE_STRING) {
+ stream_ << " \""
+ << string_pool.string8ObjectAt(target_entry.data_value - string_pool_offset).c_str()
+ << "\"";
+ } else {
+ stream_ << " " << base::StringPrintf("0x%08x", target_entry.data_value);
+ }
- 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);
+ Result<std::string> name = utils::ResToTypeEntryName(target_am_, target_entry.target_id);
if (name) {
stream_ << " " << *name;
}
diff --git a/cmds/idmap2/libidmap2/RawPrintVisitor.cpp b/cmds/idmap2/libidmap2/RawPrintVisitor.cpp
index dd14fd4..13973d6 100644
--- a/cmds/idmap2/libidmap2/RawPrintVisitor.cpp
+++ b/cmds/idmap2/libidmap2/RawPrintVisitor.cpp
@@ -47,46 +47,94 @@
if (target_apk_) {
target_am_.SetApkAssets({target_apk_.get()});
}
+
+ overlay_apk_ = ApkAssets::Load(header.GetOverlayPath().to_string());
+ if (overlay_apk_) {
+ overlay_am_.SetApkAssets({overlay_apk_.get()});
+ }
}
void RawPrintVisitor::visit(const IdmapData& data ATTRIBUTE_UNUSED) {
+ const bool target_package_loaded = !target_am_.GetApkAssets().empty();
+ const bool overlay_package_loaded = !overlay_am_.GetApkAssets().empty();
+
+ for (auto& target_entry : data.GetTargetEntries()) {
+ Result<std::string> target_name(Error(""));
+ if (target_package_loaded) {
+ target_name = utils::ResToTypeEntryName(target_am_, target_entry.target_id);
+ }
+ if (target_name) {
+ print(target_entry.target_id, "target id: %s", target_name->c_str());
+ } else {
+ print(target_entry.target_id, "target id");
+ }
+
+ print(target_entry.data_type, "type: %s",
+ utils::DataTypeToString(target_entry.data_type).data());
+
+ Result<std::string> overlay_name(Error(""));
+ if (overlay_package_loaded && (target_entry.data_type == Res_value::TYPE_REFERENCE ||
+ target_entry.data_type == Res_value::TYPE_DYNAMIC_REFERENCE)) {
+ overlay_name = utils::ResToTypeEntryName(overlay_am_, target_entry.data_value);
+ }
+ if (overlay_name) {
+ print(target_entry.data_value, "value: %s", overlay_name->c_str());
+ } else {
+ print(target_entry.data_value, "value");
+ }
+ }
+
+ for (auto& overlay_entry : data.GetOverlayEntries()) {
+ Result<std::string> overlay_name(Error(""));
+ if (overlay_package_loaded) {
+ overlay_name = utils::ResToTypeEntryName(overlay_am_, overlay_entry.overlay_id);
+ }
+
+ if (overlay_name) {
+ print(overlay_entry.overlay_id, "overlay id: %s", overlay_name->c_str());
+ } else {
+ print(overlay_entry.overlay_id, "overlay id");
+ }
+
+ Result<std::string> target_name(Error(""));
+ if (target_package_loaded) {
+ target_name = utils::ResToTypeEntryName(target_am_, overlay_entry.target_id);
+ }
+
+ if (target_name) {
+ print(overlay_entry.target_id, "target id: %s", target_name->c_str());
+ } else {
+ print(overlay_entry.target_id, "target id");
+ }
+ }
+
+ const size_t string_pool_length = data.GetHeader()->GetStringPoolLength();
+ if (string_pool_length > 0) {
+ print_raw(string_pool_length, "%zu raw string pool bytes", string_pool_length);
+ }
}
void RawPrintVisitor::visit(const IdmapData::Header& header) {
- print(static_cast<uint16_t>(header.GetTargetPackageId()), "target package id");
- print(header.GetTypeCount(), "type count");
- last_seen_package_id_ = header.GetTargetPackageId();
+ print(header.GetTargetPackageId(), "target package id");
+ print(header.GetOverlayPackageId(), "overlay package id");
+ print(header.GetTargetEntryCount(), "target entry count");
+ print(header.GetOverlayEntryCount(), "overlay entry count");
+ print(header.GetStringPoolIndexOffset(), "string pool index offset");
+ print(header.GetStringPoolLength(), "string pool byte length");
}
-void RawPrintVisitor::visit(const IdmapData::TypeEntry& type_entry) {
- const bool target_package_loaded = !target_am_.GetApkAssets().empty();
+// NOLINTNEXTLINE(cert-dcl50-cpp)
+void RawPrintVisitor::print(uint8_t value, const char* fmt, ...) {
+ va_list ap;
+ va_start(ap, fmt);
+ std::string comment;
+ base::StringAppendV(&comment, fmt, ap);
+ va_end(ap);
- print(static_cast<uint16_t>(type_entry.GetTargetTypeId()), "target type");
- print(static_cast<uint16_t>(type_entry.GetOverlayTypeId()), "overlay type");
- print(static_cast<uint16_t>(type_entry.GetEntryCount()), "entry count");
- print(static_cast<uint16_t>(type_entry.GetEntryOffset()), "entry offset");
+ stream_ << base::StringPrintf("%08zx: %02x", offset_, value) << " " << comment
+ << std::endl;
- for (uint16_t i = 0; i < type_entry.GetEntryCount(); i++) {
- const EntryId entry = type_entry.GetEntry(i);
- if (entry == kNoEntry) {
- print(kPadding, "no entry");
- } else {
- const ResourceId target_resid = RESID(last_seen_package_id_, type_entry.GetTargetTypeId(),
- type_entry.GetEntryOffset() + i);
- const ResourceId overlay_resid =
- RESID(last_seen_package_id_, type_entry.GetOverlayTypeId(), entry);
- Result<std::string> name(Error(""));
- if (target_package_loaded) {
- name = utils::ResToTypeEntryName(target_am_, target_resid);
- }
- if (name) {
- print(static_cast<uint32_t>(entry), "0x%08x -> 0x%08x %s", target_resid, overlay_resid,
- name->c_str());
- } else {
- print(static_cast<uint32_t>(entry), "0x%08x -> 0x%08x", target_resid, overlay_resid);
- }
- }
- }
+ offset_ += sizeof(uint8_t);
}
// NOLINTNEXTLINE(cert-dcl50-cpp)
@@ -123,10 +171,23 @@
base::StringAppendV(&comment, fmt, ap);
va_end(ap);
- stream_ << base::StringPrintf("%08zx: ", offset_) << "........ " << comment << ": " << value
+ stream_ << base::StringPrintf("%08zx: ", offset_) << "........ " << comment << ": " << value
<< std::endl;
offset_ += kIdmapStringLength;
}
+// NOLINTNEXTLINE(cert-dcl50-cpp)
+void RawPrintVisitor::print_raw(uint32_t length, const char* fmt, ...) {
+ va_list ap;
+ va_start(ap, fmt);
+ std::string comment;
+ base::StringAppendV(&comment, fmt, ap);
+ va_end(ap);
+
+ stream_ << base::StringPrintf("%08zx: ", offset_) << "........ " << comment << std::endl;
+
+ offset_ += length;
+}
+
} // namespace android::idmap2
diff --git a/cmds/idmap2/libidmap2/ResourceMapping.cpp b/cmds/idmap2/libidmap2/ResourceMapping.cpp
index 95ae626..651d20f 100644
--- a/cmds/idmap2/libidmap2/ResourceMapping.cpp
+++ b/cmds/idmap2/libidmap2/ResourceMapping.cpp
@@ -192,9 +192,14 @@
// Only rewrite resources defined within the overlay package to their corresponding target
// resource ids at runtime.
bool rewrite_overlay_reference =
- (overlay_resource->dataType == Res_value::TYPE_REFERENCE)
+ (overlay_resource->dataType == Res_value::TYPE_REFERENCE ||
+ overlay_resource->dataType == Res_value::TYPE_DYNAMIC_REFERENCE)
? overlay_package_id == EXTRACT_PACKAGE(overlay_resource->data)
: false;
+
+ if (rewrite_overlay_reference) {
+ overlay_resource->dataType = Res_value::TYPE_DYNAMIC_REFERENCE;
+ }
resource_mapping.AddMapping(target_id, overlay_resource->dataType, overlay_resource->data,
rewrite_overlay_reference);
@@ -224,7 +229,7 @@
}
resource_mapping.AddMapping(target_resource, Res_value::TYPE_REFERENCE, overlay_resid,
- /* rewrite_overlay_reference */ true);
+ /* rewrite_overlay_reference */ false);
}
return resource_mapping;
@@ -378,7 +383,8 @@
target_map_.insert(std::make_pair(target_resource, TargetValue{data_type, data_value}));
- if (rewrite_overlay_reference && data_type == Res_value::TYPE_REFERENCE) {
+ if (rewrite_overlay_reference &&
+ (data_type == Res_value::TYPE_REFERENCE || data_type == Res_value::TYPE_DYNAMIC_REFERENCE)) {
overlay_map_.insert(std::make_pair(data_value, target_resource));
}
@@ -394,8 +400,8 @@
const TargetValue value = target_iter->second;
target_map_.erase(target_iter);
- // Remove rewriting of overlay resource id to target resource id.
- if (value.data_type != Res_value::TYPE_REFERENCE) {
+ if (value.data_type != Res_value::TYPE_REFERENCE &&
+ value.data_type != Res_value::TYPE_DYNAMIC_REFERENCE) {
return;
}
diff --git a/cmds/idmap2/libidmap2/ResourceUtils.cpp b/cmds/idmap2/libidmap2/ResourceUtils.cpp
index 9d32692..a5df746 100644
--- a/cmds/idmap2/libidmap2/ResourceUtils.cpp
+++ b/cmds/idmap2/libidmap2/ResourceUtils.cpp
@@ -33,6 +33,40 @@
namespace android::idmap2::utils {
+StringPiece DataTypeToString(uint8_t data_type) {
+ switch (data_type) {
+ case Res_value::TYPE_NULL:
+ return "null";
+ case Res_value::TYPE_REFERENCE:
+ return "reference";
+ case Res_value::TYPE_ATTRIBUTE:
+ return "attribute";
+ case Res_value::TYPE_STRING:
+ return "string";
+ case Res_value::TYPE_FLOAT:
+ return "float";
+ case Res_value::TYPE_DIMENSION:
+ return "dimension";
+ case Res_value::TYPE_FRACTION:
+ return "fraction";
+ case Res_value::TYPE_DYNAMIC_REFERENCE:
+ return "reference (dynamic)";
+ case Res_value::TYPE_DYNAMIC_ATTRIBUTE:
+ return "attribute (dynamic)";
+ case Res_value::TYPE_INT_DEC:
+ case Res_value::TYPE_INT_HEX:
+ return "integer";
+ case Res_value::TYPE_INT_BOOLEAN:
+ return "boolean";
+ case Res_value::TYPE_INT_COLOR_ARGB8:
+ case Res_value::TYPE_INT_COLOR_RGB8:
+ case Res_value::TYPE_INT_COLOR_RGB4:
+ return "color";
+ default:
+ return "unknown";
+ }
+}
+
Result<std::string> ResToTypeEntryName(const AssetManager2& am, uint32_t resid) {
AssetManager2::ResourceName name;
if (!am.GetResourceName(resid, &name)) {
@@ -129,7 +163,7 @@
info.requiredSystemPropertyName = *result_str;
}
- if (auto result_str = overlay_it->GetAttributeStringValue("requiredSystemPropertyValue")) {
+ if (auto result_str = overlay_it->GetAttributeStringValue("requiredSystemPropertyValue")) {
info.requiredSystemPropertyValue = *result_str;
}