commit 053404e7568465cd1bd1d89e4289908f56f4a379
author Sorin Basca <sorinbasca@google.com> Thu Sep 29 07:19:53 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 29 07:19:53 2022 +0000
tree e29cd62385ee42135c782962be52e44098675180
parent 14cbdbefd37121b696f2284f66d672c2c9c6dd37
parent a8029ae0d59e07c96f0a9d3ec6c3658b58625e2f

Merge "Exclude jdiff from build" am: a6b43f7ba6 am: 96820d9d3f am: 6b1e2a88d4 am: a8029ae0d5

Original change: https://android-review.googlesource.com/c/platform/external/jdiff/+/2217162

Change-Id: Ib041dcccd924faa8244d04aeaf35dbc8d3d0798f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 22ae7fe..f22fe1c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,9 +46,11 @@
     ],
 }
 
-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,
+// }