Snap for 11120126 from b600abc3400fbdefa2ed8f7fcf01176aa676ff08 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Id7639f3d0c40d52e6edaecd81f0ae7c3aa446c93

1 files changed, 9 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index a5d103da..28f4af04 100644
--- a/Android.bp
+++ b/Android.bp
@@ -238,11 +238,13 @@ genrule {
     tools: ["libxml2_genseed"],
     srcs: [
         "test/schemas/*.xsd",
+        "test/schemas/*.inc",
+        "test/schemas/*.imp",
     ],
     // The genseed tool only writes under its current directory.
     // We move outputs to the correct location after generation..
     cmd: "mkdir -p seed/schema && " +
-         "$(location libxml2_genseed) schema $(in) && " +
+         "$(location libxml2_genseed) schema $(locations test/schemas/*.xsd) && " +
          "mkdir -p $(genDir)/fuzz/seed/schema && " +
          "mv -f seed/schema/* $(genDir)/fuzz/seed/schema",
     out: [
@@ -429,13 +431,19 @@ genrule {
     tools: ["libxml2_genseed"],
     srcs: [
         "test/*",
+        "test/dtds/*.dtd",
+        "test/errors/rec_ext.ent",
         "test/errors/*.xml",
         "test/errors10/*.xml",
         "test/namespaces/*",
         "test/valid/*.xml",
+        "test/valid/*.dtd",
+        "test/valid/dtds/*",
         "test/VC/*",
+        "test/VC/dtds/*.dtd",
         "test/VCM/*",
         "test/XInclude/docs/*",
+        "test/XInclude/ents/*",
         "test/XInclude/without-reader/*",
         "test/xmlid/*",
     ],