diff --git a/displayservice/1.0/Android.bp b/displayservice/1.0/Android.bp
index 7d000f8..d073631 100644
--- a/displayservice/1.0/Android.bp
+++ b/displayservice/1.0/Android.bp
@@ -53,13 +53,16 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.frameworks.displayservice@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.frameworks.displayservice@1.0_genc++"],
     generated_headers: ["android.frameworks.displayservice@1.0_genc++_headers"],
     export_generated_headers: ["android.frameworks.displayservice@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
diff --git a/schedulerservice/1.0/Android.bp b/schedulerservice/1.0/Android.bp
index 43ee5f3..ba75f9b 100644
--- a/schedulerservice/1.0/Android.bp
+++ b/schedulerservice/1.0/Android.bp
@@ -35,13 +35,16 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.frameworks.schedulerservice@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.frameworks.schedulerservice@1.0_genc++"],
     generated_headers: ["android.frameworks.schedulerservice@1.0_genc++_headers"],
     export_generated_headers: ["android.frameworks.schedulerservice@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
diff --git a/sensorservice/1.0/Android.bp b/sensorservice/1.0/Android.bp
index 4451f84..5e3ba38 100644
--- a/sensorservice/1.0/Android.bp
+++ b/sensorservice/1.0/Android.bp
@@ -60,13 +60,16 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.frameworks.sensorservice@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.frameworks.sensorservice@1.0_genc++"],
     generated_headers: ["android.frameworks.sensorservice@1.0_genc++_headers"],
     export_generated_headers: ["android.frameworks.sensorservice@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
diff --git a/vr/composer/1.0/Android.bp b/vr/composer/1.0/Android.bp
index d2e32c3..8479c00 100644
--- a/vr/composer/1.0/Android.bp
+++ b/vr/composer/1.0/Android.bp
@@ -35,13 +35,16 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.frameworks.vr.composer@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.frameworks.vr.composer@1.0_genc++"],
     generated_headers: ["android.frameworks.vr.composer@1.0_genc++_headers"],
     export_generated_headers: ["android.frameworks.vr.composer@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",