Merge "Prepare for adding apache-xml to core APIs"
diff --git a/Android.bp b/Android.bp
index d4e2a9b..1189a31 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,14 +14,23 @@
 // limitations under the License.
 //
 
+// The set of files that contribute to APIs.
+// Generally, apache-xml source files are not marked with @hide so we add them
+// one-by-one after having done so.
+filegroup {
+    name: "apache-xml_api_files",
+    srcs: [],
+}
+
 java_library {
     name: "apache-xml",
-    installable: true,
-    hostdex: true,
-    no_framework_libs: true,
     srcs: ["src/main/java/**/*.java"],
     java_resource_dirs: ["src/main/java"],
+
+    installable: true,
+    hostdex: true,
     errorprone: {
         javacflags: ["-Xep:MissingOverride:OFF"],
     },
+    no_framework_libs: true,
 }