diff options
| author | vichang <vichang@google.com> | 2021-02-25 09:35:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-25 09:35:27 +0000 |
| commit | ff03db69c88c2bec3baf7fa77dde36a66f641f78 (patch) | |
| tree | 1edf6967de1be5b362914abefb9d8e1416ec6ff9 /JavaLibrary.bp | |
| parent | 7ac3ccc691116142d82ff51748685e051919c8fa (diff) | |
| parent | 23102e414c5a27cce17c3b43d9735a1110956472 (diff) | |
Merge changes from topic "javaxXmlTest"
* changes:
Android patch: Add tests for javax.xml.transform
Import test for javax.xml.transform from 9+181
Diffstat (limited to 'JavaLibrary.bp')
| -rw-r--r-- | JavaLibrary.bp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/JavaLibrary.bp b/JavaLibrary.bp index c4288f5584..0ddbe6125a 100644 --- a/JavaLibrary.bp +++ b/JavaLibrary.bp @@ -527,6 +527,14 @@ genrule { tools: ["smali"], } +filegroup { + name: "core-ojtests-javax-resources", + // Set path to keep the resources and .class files in the same directory in the jar file. + path: "ojluni/src", + srcs: ["ojluni/src/test/javax/**/*"], + exclude_srcs: ["ojluni/src/test/javax/**/*.java"], +} + // Builds the core-tests library. java_test { name: "core-tests", @@ -561,6 +569,7 @@ java_test { ], exclude_java_resource_dirs: [ "ojluni/src/test/java", + "ojluni/src/test/javax", "ojluni/src/test/resources", ], @@ -646,12 +655,17 @@ java_test { srcs: [ "ojluni/src/test/java/**/*.java", + "ojluni/src/test/javax/**/*.java", ], java_resource_dirs: [ "ojluni/src/test/java", "ojluni/src/test/resources", ], + java_resources: [ + ":core-ojtests-javax-resources", + ], + sdk_version: "none", system_modules: "core-all-system-modules", libs: [ @@ -689,6 +703,7 @@ java_test { defaults: ["libcore_java_defaults"], srcs: [ "ojluni/src/test/java/**/*.java", + "ojluni/src/test/javax/**/*.java", ], // Filter out the following: // 1.) DeserializeMethodTest and SerializedLambdaTest, because they depends on stub classes @@ -707,6 +722,10 @@ java_test { "ojluni/src/test/dist", ], + java_resources: [ + ":core-ojtests-javax-resources", + ], + sdk_version: "none", system_modules: "core-all-system-modules", libs: [ |