diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp
index f5edf0d..087cf7c 100644
--- a/camera/device/1.0/Android.bp
+++ b/camera/device/1.0/Android.bp
@@ -11,7 +11,7 @@
 genrule {
     name: "vendor.qti.hardware.camera.device@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces/ -randroid.hidl:system/libhidl/transport/ -rvendor.qti.hardware:vendor/qcom/opensource/interfaces vendor.qti.hardware.camera.device@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces/ -randroid.hidl:system/libhidl/transport/ -rvendor.qti.hardware:vendor/qcom/opensource/interfaces/ vendor.qti.hardware.camera.device@1.0",
     srcs: [
         ":vendor.qti.hardware.camera.device@1.0_hal",
     ],
@@ -24,7 +24,7 @@
 genrule {
     name: "vendor.qti.hardware.camera.device@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces/ -randroid.hidl:system/libhidl/transport/ -rvendor.qti.hardware:vendor/qcom/opensource/interfaces vendor.qti.hardware.camera.device@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces/ -randroid.hidl:system/libhidl/transport/ -rvendor.qti.hardware:vendor/qcom/opensource/interfaces/ vendor.qti.hardware.camera.device@1.0",
     srcs: [
         ":vendor.qti.hardware.camera.device@1.0_hal",
     ],
@@ -41,6 +41,34 @@
 
 cc_library_shared {
     name: "vendor.qti.hardware.camera.device@1.0",
+    defaults: ["hidl-module-defaults"],
+    generated_sources: ["vendor.qti.hardware.camera.device@1.0_genc++"],
+    generated_headers: ["vendor.qti.hardware.camera.device@1.0_genc++_headers"],
+    export_generated_headers: ["vendor.qti.hardware.camera.device@1.0_genc++_headers"],
+    vendor_available: true,
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "android.hardware.camera.device@1.0",
+        "android.hidl.base@1.0",
+    ],
+    export_shared_lib_headers: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libutils",
+        "android.hardware.camera.device@1.0",
+        "android.hidl.base@1.0",
+    ],
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.camera.device@1.0_vendor",
+    defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.qti.hardware.camera.device@1.0_genc++"],
     generated_headers: ["vendor.qti.hardware.camera.device@1.0_genc++_headers"],
     export_generated_headers: ["vendor.qti.hardware.camera.device@1.0_genc++_headers"],