commit a7ba6b68139bbd0d092da8e1f9f99a2357688b63
author Iurii Makhno <iuriimak@google.com> Fri Nov 11 17:59:57 2022 +0000
committer Iurii Makhno <iuriimak@google.com> Fri Nov 11 18:32:13 2022 +0000
tree 9668a1a03f20000bcf3d863f97f80046b240e239
parent f0f510e46d03a508c7edd8de48ef4b6761e90ff6

Do not validate localeConfig if it is referenced as external symbol.

Bug: b/258816606
Test: Link_test
Change-Id: I5dd4aa75c02ceebad26d025a99ba302ec673abf8

tools/aapt2/cmd/Link.cpp

diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp
index 116dcd6..a8d2299 100644
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -1085,6 +1085,10 @@
       const auto localeconfig_entry =
           ResolveTableEntry(context_, &final_table_, localeconfig_reference);
       if (!localeconfig_entry) {
+        // If locale config is resolved from external symbols - skip validation.
+        if (context_->GetExternalSymbols()->FindByReference(*localeconfig_reference)) {
+          return true;
+        }
         context_->GetDiagnostics()->Error(
             android::DiagMessage(localeConfig->compiled_value->GetSource())
             << "no localeConfig entry");