commit ad9e1324ff2c459d0ee6ee571d4a3e458c02cc81
author Izabela Orlowska <imorlowska@google.com> Tue Dec 19 16:22:42 2017 +0000
committer Izabela Orlowska <imorlowska@google.com> Wed Dec 20 13:25:59 2017 +0000
tree 52c46ddcc0902f3495cdfeb626b9e697fdb9456f
parent 8226fd9e7d9bbf2b9d3f2293e788628ef229b136

AAPT2: treat manifest validation errors as warnings when asked

Bug: 65670329
Test: updated
Change-Id: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9

tools/aapt2/link/ManifestFixer.cpp

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index a68df1d..da05dc3 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -430,7 +430,10 @@
     return false;
   }
 
-  if (!executor.Execute(xml::XmlActionExecutorPolicy::kWhitelist, context->GetDiagnostics(), doc)) {
+  xml::XmlActionExecutorPolicy policy = options_.warn_validation
+                                            ? xml::XmlActionExecutorPolicy::kWhitelistWarning
+                                            : xml::XmlActionExecutorPolicy::kWhitelist;
+  if (!executor.Execute(policy, context->GetDiagnostics(), doc)) {
     return false;
   }