diff --git a/configstore/utils/Android.bp b/configstore/utils/Android.bp
index 32053a7..aa420d1 100644
--- a/configstore/utils/Android.bp
+++ b/configstore/utils/Android.bp
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-cc_library_static {
+cc_library_headers {
     name: "android.hardware.configstore-utils",
+    defaults: ["hidl_defaults"],
     export_include_dirs: ["include"],
-    srcs: [],
     shared_libs: [
-        "android.hardware.configstore@1.0",
+        "libhidlbase"
     ],
     export_shared_lib_headers: [
-        "android.hardware.configstore@1.0",
+        "libhidlbase"
     ],
 }
-