commit 07e40c436fe92aafcb79acff5d0d4333e5fa1dd5
author Neha Pattan <npattan@google.com> Fri Feb 17 18:34:55 2023 +0000
committer Neha Pattan <npattan@google.com> Fri Feb 17 22:06:41 2023 +0000
tree cc98cb2ae47e22d126b081e707838231880d1cdf
parent be17cef94ae0d1ea64c527f40a5ec16df995c6db
parent b0915ceae9262d08d19fb370528e6aa602897519

(TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21173774

Change-Id: If240d22844ce47df705295965261537d13bb4654
Merged-In: Ia583fddcb88a21b5c739c7438c07967e7e581099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Bug: 263816046
Ignore-AOSP-First: Automerger fix

Android.bp

diff --git a/Android.bp b/Android.bp
index 33b84a0..535fc7a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,13 +42,16 @@
     hostdex: true,
     sdk_version: "core_current",
     srcs: ["src/**/*.java"],
-    apex_available:[
+    apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.devicelock",
         "com.android.extservices",
+        "com.android.healthfitness",
         "com.android.ondevicepersonalization",
     ],
 }
+
 //
 // TCK (Test Compatibility Kit)
 // -- For DI frameworks that want to test compatibility with javax.
@@ -59,4 +62,9 @@
         "jsr330",
         "junit",
     ],
+    errorprone: {
+        javacflags: [
+            "-Xep:OverridesJavaxInjectableMethod:WARN",
+        ],
+    },
 }