Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev
diff --git a/audio_route/Android.bp b/audio_route/Android.bp
index 6534e46..d410754 100644
--- a/audio_route/Android.bp
+++ b/audio_route/Android.bp
@@ -1,6 +1,9 @@
 cc_library_shared {
     name: "libaudioroute",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     srcs: ["audio_route.c"],
     shared_libs: [
         "liblog",
diff --git a/audio_utils/Android.bp b/audio_utils/Android.bp
index f0f0097..bab4b48 100644
--- a/audio_utils/Android.bp
+++ b/audio_utils/Android.bp
@@ -15,6 +15,9 @@
 cc_library {
     name: "libaudioutils",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     host_supported: true,
     defaults: ["audio_utils_defaults"],
 
diff --git a/camera/Android.bp b/camera/Android.bp
index ba31c56..4b234be 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -3,6 +3,9 @@
 cc_library_shared {
     name: "libcamera_metadata",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     srcs: ["src/camera_metadata.c"],
 
     include_dirs: ["system/media/private/camera/include"],
diff --git a/radio/Android.bp b/radio/Android.bp
index 91ded20..1ee4485 100644
--- a/radio/Android.bp
+++ b/radio/Android.bp
@@ -1,6 +1,9 @@
 cc_library_shared {
     name: "libradio_metadata",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
 
     srcs: [
         "src/radio_metadata.c",