diff --git a/XMPCore/Android.bp b/XMPCore/Android.bp
index 4a6bc57..a704dcb 100644
--- a/XMPCore/Android.bp
+++ b/XMPCore/Android.bp
@@ -17,7 +17,13 @@
 
 java_library {
     name: "xmp_toolkit",
+    host_supported: true,
     // Include all the java files.
     srcs: ["src/**/*.java"],
     sdk_version: "current",
+    errorprone: {
+        javacflags: [
+            "-Xep:ComparableType:WARN",
+        ],
+    },
 }