Mark the module as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: Ia88348f4904dfc6ffb9ad139cac986b4b9438ff7

diff --git a/audio_route/Android.bp b/audio_route/Android.bp
index 6534e46..d410754 100644 (file)
--- 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 (file)
--- a/audio_utils/Android.bp
+++ b/audio_utils/Android.bp
@@ -15,6 +15,9 @@ cc_defaults {
 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 (file)
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -3,6 +3,9 @@ subdirs = ["tests"]
 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 (file)
--- 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",