diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp
index aff56a8..4fe1f2d 100644
--- a/health/1.0/Android.bp
+++ b/health/1.0/Android.bp
@@ -66,6 +66,53 @@
 }
 
 genrule {
+    name: "android.hardware.health-V1.0-java_gen_java",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
+    srcs: [
+        ":android.hardware.health@1.0_hal",
+    ],
+    out: [
+        "android/hardware/health/V1_0/BatteryHealth.java",
+        "android/hardware/health/V1_0/BatteryStatus.java",
+        "android/hardware/health/V1_0/HealthConfig.java",
+        "android/hardware/health/V1_0/HealthInfo.java",
+        "android/hardware/health/V1_0/Result.java",
+        "android/hardware/health/V1_0/IHealth.java",
+    ],
+}
+
+java_library {
+    name: "android.hardware.health-V1.0-java",
+    no_framework_libs: true,
+    defaults: ["hidl-java-module-defaults"],
+    srcs: [":android.hardware.health-V1.0-java_gen_java"],
+    libs: [
+        "hwbinder",
+        "android.hidl.base-V1.0-java",
+    ]
+}
+
+genrule {
+    name: "android.hardware.health-V1.0-java-constants_gen_java",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
+    srcs: [
+        ":android.hardware.health@1.0_hal",
+    ],
+    out: [
+        "android/hardware/health/V1_0/Constants.java",
+    ],
+}
+
+java_library {
+    name: "android.hardware.health-V1.0-java-constants",
+    no_framework_libs: true,
+    defaults: ["hidl-java-module-defaults"],
+    srcs: [":android.hardware.health-V1.0-java-constants_gen_java"],
+}
+
+genrule {
     name: "android.hardware.health@1.0-adapter-helper_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
@@ -89,7 +136,6 @@
     ],
 }
 
-
 cc_library {
     name: "android.hardware.health@1.0-adapter-helper",
     defaults: ["hidl-module-defaults"],