summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--benchmarks/src/benchmarks/XmlParseBenchmark.java3
-rw-r--r--benchmarks/src/benchmarks/XmlSerializeBenchmark.java2
-rw-r--r--luni/src/main/java/libcore/util/XmlObjectFactory.java4
-rw-r--r--luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java2
-rw-r--r--luni/src/test/java/libcore/xml/KxmlPullParserDtdTest.java2
-rw-r--r--luni/src/test/java/libcore/xml/KxmlPullParserTest.java2
-rw-r--r--luni/src/test/java/libcore/xml/KxmlSerializerTest.java2
-rw-r--r--luni/src/test/java/libcore/xml/XmlPullParserFactoryTest.java4
-rw-r--r--non_openjdk_java_files.bp4
-rw-r--r--xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java (renamed from xml/src/main/java/org/kxml2/io/KXmlParser.java)2
-rw-r--r--xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java (renamed from xml/src/main/java/org/kxml2/io/KXmlSerializer.java)2
-rw-r--r--xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java4
12 files changed, 17 insertions, 16 deletions
diff --git a/benchmarks/src/benchmarks/XmlParseBenchmark.java b/benchmarks/src/benchmarks/XmlParseBenchmark.java
index 69ab7a5dce..1029616d3d 100644
--- a/benchmarks/src/benchmarks/XmlParseBenchmark.java
+++ b/benchmarks/src/benchmarks/XmlParseBenchmark.java
@@ -65,7 +65,8 @@ public class XmlParseBenchmark {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
documentBuilder = builderFactory.newDocumentBuilder();
- kxmlConstructor = (Constructor) Class.forName("org.kxml2.io.KXmlParser").getConstructor();
+ kxmlConstructor = (Constructor) Class.forName("com.android.org.kxml2.io.KXmlParser")
+ .getConstructor();
expatConstructor = (Constructor) Class.forName("org.apache.harmony.xml.ExpatPullParser")
.getConstructor();
}
diff --git a/benchmarks/src/benchmarks/XmlSerializeBenchmark.java b/benchmarks/src/benchmarks/XmlSerializeBenchmark.java
index c542e87ce0..a8c51b395e 100644
--- a/benchmarks/src/benchmarks/XmlSerializeBenchmark.java
+++ b/benchmarks/src/benchmarks/XmlSerializeBenchmark.java
@@ -81,7 +81,7 @@ public class XmlSerializeBenchmark {
@SuppressWarnings("unchecked")
@BeforeExperiment
protected void setUp() throws Exception {
- kxmlConstructor = (Constructor) Class.forName("org.kxml2.io.KXmlSerializer")
+ kxmlConstructor = (Constructor) Class.forName("com.android.org.kxml2.io.KXmlSerializer")
.getConstructor();
fastConstructor = (Constructor) Class.forName("com.android.internal.util.FastXmlSerializer")
.getConstructor();
diff --git a/luni/src/main/java/libcore/util/XmlObjectFactory.java b/luni/src/main/java/libcore/util/XmlObjectFactory.java
index ec90f67441..139f3a07b2 100644
--- a/luni/src/main/java/libcore/util/XmlObjectFactory.java
+++ b/luni/src/main/java/libcore/util/XmlObjectFactory.java
@@ -16,9 +16,9 @@
package libcore.util;
+import com.android.org.kxml2.io.KXmlParser;
+import com.android.org.kxml2.io.KXmlSerializer;
import org.apache.harmony.xml.ExpatReader;
-import org.kxml2.io.KXmlParser;
-import org.kxml2.io.KXmlSerializer;
import org.xml.sax.XMLReader;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlSerializer;
diff --git a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
index 4f54fb55cc..b6ed988ad8 100644
--- a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
@@ -16,6 +16,7 @@
package org.apache.harmony.xml.parsers;
+import com.android.org.kxml2.io.KXmlParser;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
@@ -26,7 +27,6 @@ import org.apache.harmony.xml.dom.DOMImplementationImpl;
import org.apache.harmony.xml.dom.DocumentImpl;
import org.apache.harmony.xml.dom.DocumentTypeImpl;
import org.apache.harmony.xml.dom.TextImpl;
-import org.kxml2.io.KXmlParser;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
diff --git a/luni/src/test/java/libcore/xml/KxmlPullParserDtdTest.java b/luni/src/test/java/libcore/xml/KxmlPullParserDtdTest.java
index 3175b371d1..0803c58283 100644
--- a/luni/src/test/java/libcore/xml/KxmlPullParserDtdTest.java
+++ b/luni/src/test/java/libcore/xml/KxmlPullParserDtdTest.java
@@ -16,7 +16,7 @@
package libcore.xml;
-import org.kxml2.io.KXmlParser;
+import com.android.org.kxml2.io.KXmlParser;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/luni/src/test/java/libcore/xml/KxmlPullParserTest.java b/luni/src/test/java/libcore/xml/KxmlPullParserTest.java
index 71f25e9da6..760668d4b9 100644
--- a/luni/src/test/java/libcore/xml/KxmlPullParserTest.java
+++ b/luni/src/test/java/libcore/xml/KxmlPullParserTest.java
@@ -16,7 +16,7 @@
package libcore.xml;
-import org.kxml2.io.KXmlParser;
+import com.android.org.kxml2.io.KXmlParser;
import org.xmlpull.v1.XmlPullParser;
public class KxmlPullParserTest extends PullParserTest {
diff --git a/luni/src/test/java/libcore/xml/KxmlSerializerTest.java b/luni/src/test/java/libcore/xml/KxmlSerializerTest.java
index fffb3f13af..4c4075b01b 100644
--- a/luni/src/test/java/libcore/xml/KxmlSerializerTest.java
+++ b/luni/src/test/java/libcore/xml/KxmlSerializerTest.java
@@ -16,11 +16,11 @@
package libcore.xml;
+import com.android.org.kxml2.io.KXmlSerializer;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import junit.framework.TestCase;
-import org.kxml2.io.KXmlSerializer;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
diff --git a/luni/src/test/java/libcore/xml/XmlPullParserFactoryTest.java b/luni/src/test/java/libcore/xml/XmlPullParserFactoryTest.java
index 7194414796..0431a161b1 100644
--- a/luni/src/test/java/libcore/xml/XmlPullParserFactoryTest.java
+++ b/luni/src/test/java/libcore/xml/XmlPullParserFactoryTest.java
@@ -16,14 +16,14 @@
package libcore.xml;
+import com.android.org.kxml2.io.KXmlParser;
+import com.android.org.kxml2.io.KXmlSerializer;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import junit.framework.TestCase;
-import org.kxml2.io.KXmlParser;
-import org.kxml2.io.KXmlSerializer;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index c99d25b35c..de4cff4433 100644
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -355,8 +355,8 @@ filegroup {
"luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java",
"libart/src/main/java/java/lang/CaseMapper.java",
"libart/src/main/java/java/lang/StringFactory.java",
- "xml/src/main/java/org/kxml2/io/KXmlParser.java",
- "xml/src/main/java/org/kxml2/io/KXmlSerializer.java",
+ "xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java",
+ "xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java",
":non_openjdk_javadoc_files",
],
}
diff --git a/xml/src/main/java/org/kxml2/io/KXmlParser.java b/xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java
index e010f1d0a1..3814e63a44 100644
--- a/xml/src/main/java/org/kxml2/io/KXmlParser.java
+++ b/xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java
@@ -20,7 +20,7 @@
// Contributors: Paul Hackenberger (unterminated entity handling in relaxed mode)
-package org.kxml2.io;
+package com.android.org.kxml2.io;
import java.io.Closeable;
import java.io.IOException;
diff --git a/xml/src/main/java/org/kxml2/io/KXmlSerializer.java b/xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java
index 25f092497a..795448d50c 100644
--- a/xml/src/main/java/org/kxml2/io/KXmlSerializer.java
+++ b/xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java
@@ -19,7 +19,7 @@
* IN THE SOFTWARE. */
-package org.kxml2.io;
+package com.android.org.kxml2.io;
import java.io.*;
import java.util.Locale;
diff --git a/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java b/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java
index 7215b3e654..61907778d4 100644
--- a/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java
+++ b/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java
@@ -37,8 +37,8 @@ public class XmlPullParserFactory {
serializerClasses = new ArrayList<String>();
try {
- parserClasses.add(Class.forName("org.kxml2.io.KXmlParser"));
- serializerClasses.add(Class.forName("org.kxml2.io.KXmlSerializer"));
+ parserClasses.add(Class.forName("com.android.org.kxml2.io.KXmlParser"));
+ serializerClasses.add(Class.forName("com.android.org.kxml2.io.KXmlSerializer"));
} catch (ClassNotFoundException e) {
throw new AssertionError();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 08:51:28 +0000