aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2022-09-29 07:50:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-29 07:50:14 +0000
commit8dd3cd57ac22eecb53bd90c4d96b77d542becf1f (patch)
treee29cd62385ee42135c782962be52e44098675180
parent14cbdbefd37121b696f2284f66d672c2c9c6dd37 (diff)
parent053404e7568465cd1bd1d89e4289908f56f4a379 (diff)
downloadjdiff-8dd3cd57ac22eecb53bd90c4d96b77d542becf1f.tar.gz
Merge "Exclude jdiff from build" am: a6b43f7ba6 am: 96820d9d3f am: 6b1e2a88d4 am: a8029ae0d5 am: 053404e756
Original change: https://android-review.googlesource.com/c/platform/external/jdiff/+/2217162 Change-Id: I258a7c35d97bc1841f3b88f36d4f654087c66ea5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp14
1 files changed, 8 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 22ae7fe..f22fe1c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,9 +46,11 @@ license {
],
}
-java_library_host {
- name: "jdiff",
- srcs: ["**/*.java"],
-
- use_tools_jar: true,
-}
+// b/246303954: jdiff is excluded from build until it is migrated to Java 17, or
+// replaced by another tool
+// java_library_host {
+// name: "jdiff",
+// srcs: ["**/*.java"],
+//
+// use_tools_jar: true,
+// }