aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Jobredeaux <jobredeaux@google.com>2022-09-06 16:19:37 -0400
committerRomain Jobredeaux <jobredeaux@google.com>2022-09-12 16:57:17 -0400
commit01f81946ddc96ce797759395e984aa02d5cb5bdb (patch)
tree982e32879b31b53ca65d10834773d32a13058437
parent73588275c72be755853a3dde49cadcdc1314e998 (diff)
downloadjacoco-01f81946ddc96ce797759395e984aa02d5cb5bdb.tar.gz
Split jacoco-cli java_library module into 3.
This should be a no-op from a Soong perspective, but Bazel does not currently support multiple resource directories specified in a single java_library module. This change is to ease the translation of the module to Bazel. Test: added manual target to CI Bug: 226423379 Bug: 186462641 Change-Id: I626ba5386b7730e8f81a4a1a4fa5a082cc0f0148
-rw-r--r--Android.bp45
1 files changed, 36 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 2211c6cc..c4481f23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -133,14 +133,31 @@ java_library_host {
manifest: "org.jacoco.cli/src/MANIFEST.MF",
srcs: [
- "org.jacoco.core/src/**/*.java",
- "org.jacoco.report/src/**/*.java",
"org.jacoco.cli/src/**/*.java",
],
+ static_libs: [
+ "jacoco-report",
+ "jacoco-core",
+ ],
+
+ dist: {
+ targets: [
+ "dist_files",
+ "apps_only",
+ ],
+ },
+}
+
+java_library_host {
+ name: "jacoco-core",
+
+ srcs: [
+ "org.jacoco.core/src/**/*.java",
+ ],
+
java_resource_dirs: [
"org.jacoco.core/src",
- "org.jacoco.report/src",
],
static_libs: [
@@ -150,10 +167,20 @@ java_library_host {
"args4j-2.0.28",
],
- dist: {
- targets: [
- "dist_files",
- "apps_only",
- ],
- },
+}
+
+java_library_host {
+ name: "jacoco-report",
+
+ srcs: [
+ "org.jacoco.report/src/**/*.java",
+ ],
+
+ java_resource_dirs: [
+ "org.jacoco.report/src",
+ ],
+
+ static_libs: [
+ "jacoco-core",
+ ],
}