From cff10cec6cb6f406f71d42b064d527549cc0cca8 Mon Sep 17 00:00:00 2001 From: Iurii Makhno Date: Tue, 15 Feb 2022 19:33:50 +0000 Subject: Switch ResourceName to use ResourceNamedType instead of ResourceType. DD: go/custom-resource-types-in-aapt2 Bug: b/215108200 Test: Resource_test.cpp Change-Id: I0b97fc0024523700e01adce788bb934d388da288 --- tools/aapt2/ResourceValues.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/aapt2/ResourceValues.cpp') diff --git a/tools/aapt2/ResourceValues.cpp b/tools/aapt2/ResourceValues.cpp index b3ab4ffc649b..b796eb07f076 100644 --- a/tools/aapt2/ResourceValues.cpp +++ b/tools/aapt2/ResourceValues.cpp @@ -116,7 +116,7 @@ bool Reference::Equals(const Value* value) const { } bool Reference::Flatten(android::Res_value* out_value) const { - if (name && name.value().type == ResourceType::kMacro) { + if (name && name.value().type.type == ResourceType::kMacro) { return false; } @@ -192,7 +192,7 @@ static void PrettyPrintReferenceImpl(const Reference& ref, bool print_package, P if (print_package) { printer->Print(name.to_string()); } else { - printer->Print(to_string(name.type)); + printer->Print(name.type.to_string()); printer->Print("/"); printer->Print(name.entry); } -- cgit v1.2.3-59-g8ed1b