RESTRICT AUTOMERGE: Update libxml2 to 2.9.8
Merge to pi-dev, restore Android.mk and revert 440b0b3d89db029dc2b8c86130461d292a8e11dc
Bug: 79662501
Bug: 36809766
Bug: 36810305
Bug: 62151041
Test: manually verify functionality for regression
Change-Id: Ib8859fc31de847c252a8705437fa67476ba6f5ad
(cherry picked from commit f921fa5d53b3ab966ba41c298ccd6b3d88574451)
diff --git a/result/errors/754946.xml.err b/result/errors/754946.xml.err
index c03e35b..be77781 100644
--- a/result/errors/754946.xml.err
+++ b/result/errors/754946.xml.err
@@ -1,19 +1,20 @@
-Entity: line 1: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+./test/errors/754946.xml:3: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
- %SYSTEM;
- ^
+ %SYSTEM;
+ ^
Entity: line 1:
A<lbbbbbbbbbbbbbbbbbbb_
^
-Entity: line 1: parser error : DOCTYPE improperly terminated
- %SYSTEM;
- ^
-Entity: line 1:
-A<lbbbbbbbbbbbbbbbbbbb_
-^
-Entity: line 1: parser error : Start tag expected, '<' not found
- %SYSTEM;
- ^
-Entity: line 1:
-A<lbbbbbbbbbbbbbbbbbbb_
-^
+./test/errors/754946.xml:4: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
+ <![
+ ^
+./test/errors/754946.xml:4: parser error : DOCTYPE improperly terminated
+ <![
+ ^
+./test/errors/754946.xml:4: parser error : StartTag: invalid element name
+ <![
+ ^
+./test/errors/754946.xml:4: parser error : Extra content at the end of the document
+ <![
+ ^