Merge "Exclude jdiff from build" am: a6b43f7ba6 am: 96820d9d3f am: 6b1e2a88d4 am: a8029ae0d5android-u-beta-1-gplmain-16k-with-phones

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>

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,
+// }