diff --git a/configstore/1.1/Android.bp b/configstore/1.1/Android.bp
index 1bddc6c..3f8d580 100644
--- a/configstore/1.1/Android.bp
+++ b/configstore/1.1/Android.bp
@@ -64,6 +64,33 @@
 }
 
 genrule {
+    name: "android.hardware.configstore-V1.1-java_gen_java",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1",
+    srcs: [
+        ":android.hardware.configstore@1.1_hal",
+    ],
+    out: [
+        "android/hardware/configstore/V1_1/ISurfaceFlingerConfigs.java",
+    ],
+}
+
+java_library {
+    name: "android.hardware.configstore-V1.1-java",
+    no_framework_libs: true,
+    defaults: ["hidl-java-module-defaults"],
+    srcs: [":android.hardware.configstore-V1.1-java_gen_java"],
+    libs: [
+        "hwbinder",
+        "android.hardware.configstore-V1.0-java",
+        "android.hidl.base-V1.0-java",
+    ]
+}
+
+// This package does not export any types. Not creating java constants export.
+
+
+genrule {
     name: "android.hardware.configstore@1.1-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.configstore@1.1",
@@ -87,7 +114,6 @@
     ],
 }
 
-
 cc_library {
     name: "android.hardware.configstore@1.1-adapter-helper",
     defaults: ["hidl-module-defaults"],
@@ -130,6 +156,7 @@
 
 cc_test {
     name: "android.hardware.configstore@1.1-adapter",
+    defaults: ["hidl-module-defaults"],
     shared_libs: [
         "libhidladapter",
         "libhidlbase",