Snap for 10453563 from e08aaa700533e9db233ddc57cb8b894eaf2a7f6f to mainline-art-release

Change-Id: Ic3a51f6f3f2cd421931b35b3f49a933d1e11d1bc
diff --git a/dexlib2/Android.bp b/dexlib2/Android.bp
index e8eb04d..2afbe17 100644
--- a/dexlib2/Android.bp
+++ b/dexlib2/Android.bp
@@ -25,8 +25,18 @@
     default_applicable_licenses: ["external_smali_license"],
 }
 
+java_defaults {
+    name: "dexlib2_defaults",
+    errorprone: {
+        javacflags: [
+            "-Xep:ComparableType:WARN",
+        ],
+    },
+}
+
 java_library_host {
     name: "dexlib2",
+    defaults: ["dexlib2_defaults"],
 
     srcs: [
         "src/main/java/**/*.java",
@@ -42,6 +52,7 @@
 
 java_library_host {
     name: "dexlib2-no-guava",
+    defaults: ["dexlib2_defaults"],
 
     srcs: [
         "src/main/java/**/*.java",
@@ -60,6 +71,7 @@
 
 java_library_host {
     name: "dexlib2-no-guava-no-cli",
+    defaults: ["dexlib2_defaults"],
 
     srcs: [
         "src/main/java/**/*.java",