Snap for 10453563 from 1a059a5a203352d3e0c2fd3ccff5719cc37fc340 to mainline-uwb-releaseaml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000android14-mainline-uwb-release

Change-Id: Ieda9649bdcc0bc90a6fd2c14029e9dd1f60c0087

5 files changed, 476 insertions, 373 deletions

diff --git a/arm/Android.bp b/arm/Android.bp
index cce5f6b..81a3316 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -1173,7 +1173,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcap.so-notice",
+    licenses: ["vndk-v31-libcap.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1240,7 +1240,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcn-cbor.so-notice",
+    licenses: ["vndk-v31-libcn-cbor.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1291,7 +1291,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcrypto.so-notice",
+    licenses: ["vndk-v31-libcrypto.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1329,7 +1329,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcurl.so-notice",
+    licenses: ["vndk-v31-libcurl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1387,7 +1387,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libevent.so-notice",
+    licenses: ["vndk-v31-libevent.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1406,7 +1406,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libexif.so-notice",
+    licenses: ["vndk-v31-libexif.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1426,7 +1426,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libexpat.so-notice",
+    licenses: ["vndk-v31-libexpat.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1558,7 +1558,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libhardware_legacy.so-notice",
+    licenses: ["vndk-v31-libhardware_legacy.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1617,7 +1617,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libjpeg.so-notice",
+    licenses: ["vndk-v31-libjpeg.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1637,7 +1637,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libldacBT_abr.so-notice",
+    licenses: ["vndk-v31-libldacBT_abr.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1657,7 +1657,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libldacBT_enc.so-notice",
+    licenses: ["vndk-v31-libldacBT_enc.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1677,7 +1677,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-liblz4.so-notice",
+    licenses: ["vndk-v31-liblz4.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1714,7 +1714,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libmedia_omx.so-notice",
+    licenses: ["vndk-v31-libmedia_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1801,7 +1801,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libminijail.so-notice",
+    licenses: ["vndk-v31-libminijail.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1838,7 +1838,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libnetutils.so-notice",
+    licenses: ["vndk-v31-libnetutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1858,7 +1858,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libnl.so-notice",
+    licenses: ["vndk-v31-libnl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1878,7 +1878,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpcre2.so-notice",
+    licenses: ["vndk-v31-libpcre2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1898,7 +1898,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpiex.so-notice",
+    licenses: ["vndk-v31-libpiex.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1918,7 +1918,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpng.so-notice",
+    licenses: ["vndk-v31-libpng.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1937,7 +1937,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpower.so-notice",
+    licenses: ["vndk-v31-libpower.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1995,7 +1995,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libspeexresampler.so-notice",
+    licenses: ["vndk-v31-libspeexresampler.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2014,7 +2014,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libsqlite.so-notice",
+    licenses: ["vndk-v31-libsqlite.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2034,7 +2034,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libssl.so-notice",
+    licenses: ["vndk-v31-libssl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2138,7 +2138,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v31-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2166,7 +2166,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_omx.so-notice",
+    licenses: ["vndk-v31-libstagefright_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2196,7 +2196,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v31-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2302,7 +2302,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libtinyalsa.so-notice",
+    licenses: ["vndk-v31-libtinyalsa.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2322,7 +2322,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libtinyxml2.so-notice",
+    licenses: ["vndk-v31-libtinyxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2341,7 +2341,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libui.so-notice",
+    licenses: ["vndk-v31-libui.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2435,7 +2435,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libxml2.so-notice",
+    licenses: ["vndk-v31-libxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2455,7 +2455,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libyuv.so-notice",
+    licenses: ["vndk-v31-libyuv.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3072,7 +3072,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libbase.so-notice",
+    licenses: ["vndk-v31-libbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3113,7 +3113,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v31-libblas.so-notice",
+    licenses: ["vndk-v31-libblas.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3134,7 +3134,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libc++.so-notice",
+    licenses: ["vndk-v31-libc++.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3157,7 +3157,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v31-libcompiler_rt.so-notice",
+    licenses: ["vndk-v31-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3175,7 +3175,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libcutils.so-notice",
+    licenses: ["vndk-v31-libcutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3265,7 +3265,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libhardware.so-notice",
+    licenses: ["vndk-v31-libhardware.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3290,7 +3290,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libhidlbase.so-notice",
+    licenses: ["vndk-v31-libhidlbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3387,7 +3387,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libjsoncpp.so-notice",
+    licenses: ["vndk-v31-libjsoncpp.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3468,7 +3468,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libutils.so-notice",
+    licenses: ["vndk-v31-libutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3494,7 +3494,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libutilscallstack.so-notice",
+    licenses: ["vndk-v31-libutilscallstack.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3520,7 +3520,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libz.so-notice",
+    licenses: ["vndk-v31-libz.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3630,7 +3630,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libbinder_ndk.so-notice",
+    licenses: ["vndk-v31-libbinder_ndk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3649,7 +3649,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libc.so-notice",
+    licenses: ["vndk-v31-libc.so-license"],
     arch: {
         arm: {
             export_system_include_dirs: [
@@ -3699,7 +3699,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libdl.so-notice",
+    licenses: ["vndk-v31-libdl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/llndk-stub/libdl.so"],
@@ -3713,7 +3713,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libft2.so-notice",
+    licenses: ["vndk-v31-libft2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3730,7 +3730,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-liblog.so-notice",
+    licenses: ["vndk-v31-liblog.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3747,7 +3747,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libm.so-notice",
+    licenses: ["vndk-v31-libm.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/llndk-stub/libm.so"],
@@ -3761,7 +3761,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libmediandk.so-notice",
+    licenses: ["vndk-v31-libmediandk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3779,7 +3779,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libnativewindow.so-notice",
+    licenses: ["vndk-v31-libnativewindow.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3796,7 +3796,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libneuralnetworks.so-notice",
+    licenses: ["vndk-v31-libneuralnetworks.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3813,7 +3813,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libselinux.so-notice",
+    licenses: ["vndk-v31-libselinux.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3830,7 +3830,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libsync.so-notice",
+    licenses: ["vndk-v31-libsync.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 715525e..6554de4 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -1811,7 +1811,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcap.so-notice",
+    licenses: ["vndk-v31-libcap.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1932,7 +1932,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcn-cbor.so-notice",
+    licenses: ["vndk-v31-libcn-cbor.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2008,7 +2008,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcrypto.so-notice",
+    licenses: ["vndk-v31-libcrypto.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2058,7 +2058,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcurl.so-notice",
+    licenses: ["vndk-v31-libcurl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2136,7 +2136,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libevent.so-notice",
+    licenses: ["vndk-v31-libevent.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2161,7 +2161,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libexif.so-notice",
+    licenses: ["vndk-v31-libexif.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2187,7 +2187,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libexpat.so-notice",
+    licenses: ["vndk-v31-libexpat.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2400,7 +2400,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libhardware_legacy.so-notice",
+    licenses: ["vndk-v31-libhardware_legacy.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2492,7 +2492,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libjpeg.so-notice",
+    licenses: ["vndk-v31-libjpeg.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2518,7 +2518,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libldacBT_abr.so-notice",
+    licenses: ["vndk-v31-libldacBT_abr.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2544,7 +2544,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libldacBT_enc.so-notice",
+    licenses: ["vndk-v31-libldacBT_enc.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2570,7 +2570,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-liblz4.so-notice",
+    licenses: ["vndk-v31-liblz4.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2619,7 +2619,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libmedia_omx.so-notice",
+    licenses: ["vndk-v31-libmedia_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2767,7 +2767,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libminijail.so-notice",
+    licenses: ["vndk-v31-libminijail.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2816,7 +2816,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libnetutils.so-notice",
+    licenses: ["vndk-v31-libnetutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2842,7 +2842,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libnl.so-notice",
+    licenses: ["vndk-v31-libnl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2868,7 +2868,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpcre2.so-notice",
+    licenses: ["vndk-v31-libpcre2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2894,7 +2894,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpiex.so-notice",
+    licenses: ["vndk-v31-libpiex.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2920,7 +2920,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpng.so-notice",
+    licenses: ["vndk-v31-libpng.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2945,7 +2945,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpower.so-notice",
+    licenses: ["vndk-v31-libpower.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3022,7 +3022,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libspeexresampler.so-notice",
+    licenses: ["vndk-v31-libspeexresampler.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3047,7 +3047,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libsqlite.so-notice",
+    licenses: ["vndk-v31-libsqlite.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3073,7 +3073,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libssl.so-notice",
+    licenses: ["vndk-v31-libssl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3244,7 +3244,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v31-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3287,7 +3287,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_omx.so-notice",
+    licenses: ["vndk-v31-libstagefright_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3334,7 +3334,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v31-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3508,7 +3508,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libtinyalsa.so-notice",
+    licenses: ["vndk-v31-libtinyalsa.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3534,7 +3534,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libtinyxml2.so-notice",
+    licenses: ["vndk-v31-libtinyxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3559,7 +3559,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libui.so-notice",
+    licenses: ["vndk-v31-libui.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3708,7 +3708,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libxml2.so-notice",
+    licenses: ["vndk-v31-libxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3734,7 +3734,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libyuv.so-notice",
+    licenses: ["vndk-v31-libyuv.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4680,7 +4680,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libbase.so-notice",
+    licenses: ["vndk-v31-libbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4734,7 +4734,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v31-libblas.so-notice",
+    licenses: ["vndk-v31-libblas.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4761,7 +4761,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libc++.so-notice",
+    licenses: ["vndk-v31-libc++.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4791,7 +4791,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v31-libcompiler_rt.so-notice",
+    licenses: ["vndk-v31-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcompiler_rt.so"],
@@ -4812,7 +4812,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libcutils.so-notice",
+    licenses: ["vndk-v31-libcutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4952,7 +4952,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libhardware.so-notice",
+    licenses: ["vndk-v31-libhardware.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4987,7 +4987,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libhidlbase.so-notice",
+    licenses: ["vndk-v31-libhidlbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5138,7 +5138,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libjsoncpp.so-notice",
+    licenses: ["vndk-v31-libjsoncpp.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5243,7 +5243,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libutils.so-notice",
+    licenses: ["vndk-v31-libutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5280,7 +5280,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libutilscallstack.so-notice",
+    licenses: ["vndk-v31-libutilscallstack.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5317,7 +5317,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libz.so-notice",
+    licenses: ["vndk-v31-libz.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5466,7 +5466,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libbinder_ndk.so-notice",
+    licenses: ["vndk-v31-libbinder_ndk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5493,7 +5493,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libc.so-notice",
+    licenses: ["vndk-v31-libc.so-license"],
     arch: {
         arm: {
             export_system_include_dirs: [
@@ -5585,7 +5585,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libdl.so-notice",
+    licenses: ["vndk-v31-libdl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/llndk-stub/libdl.so"],
@@ -5602,7 +5602,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libft2.so-notice",
+    licenses: ["vndk-v31-libft2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5625,7 +5625,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-liblog.so-notice",
+    licenses: ["vndk-v31-liblog.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5648,7 +5648,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libm.so-notice",
+    licenses: ["vndk-v31-libm.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/llndk-stub/libm.so"],
@@ -5665,7 +5665,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libmediandk.so-notice",
+    licenses: ["vndk-v31-libmediandk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5690,7 +5690,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libnativewindow.so-notice",
+    licenses: ["vndk-v31-libnativewindow.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5713,7 +5713,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libneuralnetworks.so-notice",
+    licenses: ["vndk-v31-libneuralnetworks.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5736,7 +5736,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libselinux.so-notice",
+    licenses: ["vndk-v31-libselinux.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5759,7 +5759,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libsync.so-notice",
+    licenses: ["vndk-v31-libsync.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
diff --git a/common/Android.bp b/common/Android.bp
index a9cc475..0bf6922 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -5,267 +5,370 @@ package {
     default_applicable_licenses: ["prebuilts_vndk_v31_license"],
 }
 
-filegroup {
-    name: "vndk-v31-libbase.so-notice",
-    srcs: ["NOTICE_FILES/libbase.so.txt"],
+license {
+    name: "vndk-v31-libbase.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: ["NOTICE_FILES/libbase.so.txt"],
+}
+
+license {
+    name: "vndk-v31-libbinder_ndk.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libbinder_ndk.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libbinder_ndk.so-notice",
-    srcs: ["NOTICE_FILES/libbinder_ndk.so.txt"],
+license {
+    name: "vndk-v31-libblas.so-license",
+    license_kinds: ["legacy_notice"],
+    license_text: ["NOTICE_FILES/libblas.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libblas.so-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
+license {
+    name: "vndk-v31-libc++.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-NCSA",
+    ],
+    license_text: ["NOTICE_FILES/libc++.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libc++.so-notice",
-    srcs: ["NOTICE_FILES/libc++.so.txt"],
+license {
+    name: "vndk-v31-libc.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-ISC",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["NOTICE_FILES/libc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libc.so-notice",
-    srcs: ["NOTICE_FILES/libc.so.txt"],
+license {
+    name: "vndk-v31-libcap.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-GPL-2.0",
+    ],
+    license_text: ["NOTICE_FILES/libcap.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libcap.so-notice",
-    srcs: ["NOTICE_FILES/libcap.so.txt"],
+license {
+    name: "vndk-v31-libcn-cbor.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libcn-cbor.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libcn-cbor.so-notice",
-    srcs: ["NOTICE_FILES/libcn-cbor.so.txt"],
+license {
+    name: "vndk-v31-libcompiler_rt.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-NCSA",
+    ],
+    license_text: ["NOTICE_FILES/libcompiler_rt.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libcompiler_rt.so-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
+license {
+    name: "vndk-v31-libcrypto.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-ISC",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-OpenSSL",
+    ],
+    license_text: ["NOTICE_FILES/libcrypto.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libcrypto.so-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+license {
+    name: "vndk-v31-libcurl.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libcurl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libcurl.so-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
+license {
+    name: "vndk-v31-libcutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libcutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libcutils.so-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
+license {
+    name: "vndk-v31-libdl.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libdl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libdl.so-notice",
-    srcs: ["NOTICE_FILES/libdl.so.txt"],
+license {
+    name: "vndk-v31-libevent.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["NOTICE_FILES/libevent.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libevent.so-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
+license {
+    name: "vndk-v31-libexif.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libexif.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libexif.so-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
+license {
+    name: "vndk-v31-libexpat.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libexpat.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libexpat.so-notice",
-    srcs: ["NOTICE_FILES/libexpat.so.txt"],
+license {
+    name: "vndk-v31-libft2.so-license",
+    license_kinds: ["SPDX-license-identifier-FTL"],
+    license_text: ["NOTICE_FILES/libft2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libft2.so-notice",
-    srcs: ["NOTICE_FILES/libft2.so.txt"],
+license {
+    name: "vndk-v31-libhardware.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libhardware.so-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
+license {
+    name: "vndk-v31-libhardware_legacy.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware_legacy.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libhardware_legacy.so-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+license {
+    name: "vndk-v31-libhidlbase.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhidlbase.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libhidlbase.so-notice",
-    srcs: ["NOTICE_FILES/libhidlbase.so.txt"],
+license {
+    name: "vndk-v31-libjpeg.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-Zlib",
+    ],
+    license_text: ["NOTICE_FILES/libjpeg.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libjpeg.so-notice",
-    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
+license {
+    name: "vndk-v31-libjsoncpp.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-MIT",
+        "legacy_unencumbered",
+    ],
+    license_text: ["NOTICE_FILES/libjsoncpp.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libjsoncpp.so-notice",
-    srcs: ["NOTICE_FILES/libjsoncpp.so.txt"],
+license {
+    name: "vndk-v31-libldacBT_abr.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libldacBT_abr.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libldacBT_abr.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
+license {
+    name: "vndk-v31-libldacBT_enc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libldacBT_enc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libldacBT_enc.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
+license {
+    name: "vndk-v31-liblog.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/liblog.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-liblog.so-notice",
-    srcs: ["NOTICE_FILES/liblog.so.txt"],
+license {
+    name: "vndk-v31-liblz4.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/liblz4.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-liblz4.so-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+license {
+    name: "vndk-v31-libm.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["NOTICE_FILES/libm.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libm.so-notice",
-    srcs: ["NOTICE_FILES/libm.so.txt"],
+license {
+    name: "vndk-v31-libmedia_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libmedia_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libmedia_omx.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
+license {
+    name: "vndk-v31-libmediandk.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-Unicode-DFS",
+    ],
+    license_text: ["NOTICE_FILES/libmediandk.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libmediandk.so-notice",
-    srcs: ["NOTICE_FILES/libmediandk.so.txt"],
+license {
+    name: "vndk-v31-libminijail.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libminijail.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libminijail.so-notice",
-    srcs: ["NOTICE_FILES/libminijail.so.txt"],
+license {
+    name: "vndk-v31-libnativewindow.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libnativewindow.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libnativewindow.so-notice",
-    srcs: ["NOTICE_FILES/libnativewindow.so.txt"],
+license {
+    name: "vndk-v31-libnetutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libnetutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libnetutils.so-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
+license {
+    name: "vndk-v31-libneuralnetworks.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MPL-2.0",
+    ],
+    license_text: ["NOTICE_FILES/libneuralnetworks.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libneuralnetworks.so-notice",
-    srcs: ["NOTICE_FILES/libneuralnetworks.so.txt"],
+license {
+    name: "vndk-v31-libnl.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libnl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libnl.so-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
+license {
+    name: "vndk-v31-libpcre2.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libpcre2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libpcre2.so-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+license {
+    name: "vndk-v31-libpiex.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpiex.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libpiex.so-notice",
-    srcs: ["NOTICE_FILES/libpiex.so.txt"],
+license {
+    name: "vndk-v31-libpng.so-license",
+    license_kinds: ["legacy_notice"],
+    license_text: ["NOTICE_FILES/libpng.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libpng.so-notice",
-    srcs: ["NOTICE_FILES/libpng.so.txt"],
+license {
+    name: "vndk-v31-libpower.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpower.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libpower.so-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
+license {
+    name: "vndk-v31-libselinux.so-license",
+    license_kinds: ["legacy_unencumbered"],
+    license_text: ["NOTICE_FILES/libselinux.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libselinux.so-notice",
-    srcs: ["NOTICE_FILES/libselinux.so.txt"],
+license {
+    name: "vndk-v31-libspeexresampler.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libspeexresampler.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libspeexresampler.so-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
+license {
+    name: "vndk-v31-libsqlite.so-license",
+    license_kinds: ["legacy_permissive"],
+    license_text: ["NOTICE_FILES/libsqlite.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libsqlite.so-notice",
-    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
+license {
+    name: "vndk-v31-libssl.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-ISC",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-OpenSSL",
+    ],
+    license_text: ["NOTICE_FILES/libssl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libssl.so-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
+license {
+    name: "vndk-v31-libstagefright_foundation.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libstagefright_foundation.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
+license {
+    name: "vndk-v31-libstagefright_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libstagefright_omx.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+license {
+    name: "vndk-v31-libstagefright_omx_utils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libstagefright_omx_utils.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+license {
+    name: "vndk-v31-libsync.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libsync.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libsync.so-notice",
-    srcs: ["NOTICE_FILES/libsync.so.txt"],
+license {
+    name: "vndk-v31-libtinyalsa.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libtinyalsa.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libtinyalsa.so-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
+license {
+    name: "vndk-v31-libtinyxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-Zlib"],
+    license_text: ["NOTICE_FILES/libtinyxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libtinyxml2.so-notice",
-    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
+license {
+    name: "vndk-v31-libui.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libui.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libui.so-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
+license {
+    name: "vndk-v31-libutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libutils.so-notice",
-    srcs: ["NOTICE_FILES/libutils.so.txt"],
+license {
+    name: "vndk-v31-libutilscallstack.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutilscallstack.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libutilscallstack.so-notice",
-    srcs: ["NOTICE_FILES/libutilscallstack.so.txt"],
+license {
+    name: "vndk-v31-libxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libxml2.so-notice",
-    srcs: ["NOTICE_FILES/libxml2.so.txt"],
+license {
+    name: "vndk-v31-libyuv.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libyuv.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v31-libyuv.so-notice",
-    srcs: ["NOTICE_FILES/libyuv.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v31-libz.so-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
+license {
+    name: "vndk-v31-libz.so-license",
+    license_kinds: ["SPDX-license-identifier-Zlib"],
+    license_text: ["NOTICE_FILES/libz.so.txt"],
 }
diff --git a/x86/Android.bp b/x86/Android.bp
index 2dccfe3..7dcc537 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -1173,7 +1173,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcap.so-notice",
+    licenses: ["vndk-v31-libcap.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1240,7 +1240,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcn-cbor.so-notice",
+    licenses: ["vndk-v31-libcn-cbor.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1291,7 +1291,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcrypto.so-notice",
+    licenses: ["vndk-v31-libcrypto.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1329,7 +1329,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcurl.so-notice",
+    licenses: ["vndk-v31-libcurl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1387,7 +1387,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libevent.so-notice",
+    licenses: ["vndk-v31-libevent.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1406,7 +1406,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libexif.so-notice",
+    licenses: ["vndk-v31-libexif.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1426,7 +1426,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libexpat.so-notice",
+    licenses: ["vndk-v31-libexpat.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1558,7 +1558,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libhardware_legacy.so-notice",
+    licenses: ["vndk-v31-libhardware_legacy.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1617,7 +1617,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libjpeg.so-notice",
+    licenses: ["vndk-v31-libjpeg.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1637,7 +1637,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libldacBT_abr.so-notice",
+    licenses: ["vndk-v31-libldacBT_abr.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1657,7 +1657,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libldacBT_enc.so-notice",
+    licenses: ["vndk-v31-libldacBT_enc.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1677,7 +1677,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-liblz4.so-notice",
+    licenses: ["vndk-v31-liblz4.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1714,7 +1714,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libmedia_omx.so-notice",
+    licenses: ["vndk-v31-libmedia_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1801,7 +1801,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libminijail.so-notice",
+    licenses: ["vndk-v31-libminijail.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1838,7 +1838,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libnetutils.so-notice",
+    licenses: ["vndk-v31-libnetutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1858,7 +1858,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libnl.so-notice",
+    licenses: ["vndk-v31-libnl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1878,7 +1878,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpcre2.so-notice",
+    licenses: ["vndk-v31-libpcre2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1898,7 +1898,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpiex.so-notice",
+    licenses: ["vndk-v31-libpiex.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1918,7 +1918,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpng.so-notice",
+    licenses: ["vndk-v31-libpng.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1937,7 +1937,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpower.so-notice",
+    licenses: ["vndk-v31-libpower.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1995,7 +1995,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libspeexresampler.so-notice",
+    licenses: ["vndk-v31-libspeexresampler.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2014,7 +2014,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libsqlite.so-notice",
+    licenses: ["vndk-v31-libsqlite.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2034,7 +2034,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libssl.so-notice",
+    licenses: ["vndk-v31-libssl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2138,7 +2138,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v31-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2166,7 +2166,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_omx.so-notice",
+    licenses: ["vndk-v31-libstagefright_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2196,7 +2196,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v31-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2302,7 +2302,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libtinyalsa.so-notice",
+    licenses: ["vndk-v31-libtinyalsa.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2322,7 +2322,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libtinyxml2.so-notice",
+    licenses: ["vndk-v31-libtinyxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2341,7 +2341,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libui.so-notice",
+    licenses: ["vndk-v31-libui.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2435,7 +2435,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libxml2.so-notice",
+    licenses: ["vndk-v31-libxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2455,7 +2455,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libyuv.so-notice",
+    licenses: ["vndk-v31-libyuv.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3072,7 +3072,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libbase.so-notice",
+    licenses: ["vndk-v31-libbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3113,7 +3113,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v31-libblas.so-notice",
+    licenses: ["vndk-v31-libblas.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3134,7 +3134,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libc++.so-notice",
+    licenses: ["vndk-v31-libc++.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3157,7 +3157,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v31-libcompiler_rt.so-notice",
+    licenses: ["vndk-v31-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3175,7 +3175,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libcutils.so-notice",
+    licenses: ["vndk-v31-libcutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3265,7 +3265,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libhardware.so-notice",
+    licenses: ["vndk-v31-libhardware.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3290,7 +3290,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libhidlbase.so-notice",
+    licenses: ["vndk-v31-libhidlbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3387,7 +3387,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libjsoncpp.so-notice",
+    licenses: ["vndk-v31-libjsoncpp.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3468,7 +3468,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libutils.so-notice",
+    licenses: ["vndk-v31-libutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3494,7 +3494,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libutilscallstack.so-notice",
+    licenses: ["vndk-v31-libutilscallstack.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3520,7 +3520,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libz.so-notice",
+    licenses: ["vndk-v31-libz.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3630,7 +3630,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libbinder_ndk.so-notice",
+    licenses: ["vndk-v31-libbinder_ndk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3649,7 +3649,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libc.so-notice",
+    licenses: ["vndk-v31-libc.so-license"],
     arch: {
         x86: {
             export_system_include_dirs: [
@@ -3699,7 +3699,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libdl.so-notice",
+    licenses: ["vndk-v31-libdl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86/shared/llndk-stub/libdl.so"],
@@ -3713,7 +3713,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libft2.so-notice",
+    licenses: ["vndk-v31-libft2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3730,7 +3730,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-liblog.so-notice",
+    licenses: ["vndk-v31-liblog.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3747,7 +3747,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libm.so-notice",
+    licenses: ["vndk-v31-libm.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86/shared/llndk-stub/libm.so"],
@@ -3761,7 +3761,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libmediandk.so-notice",
+    licenses: ["vndk-v31-libmediandk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3779,7 +3779,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libnativewindow.so-notice",
+    licenses: ["vndk-v31-libnativewindow.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3796,7 +3796,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libneuralnetworks.so-notice",
+    licenses: ["vndk-v31-libneuralnetworks.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3813,7 +3813,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libselinux.so-notice",
+    licenses: ["vndk-v31-libselinux.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3830,7 +3830,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libsync.so-notice",
+    licenses: ["vndk-v31-libsync.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 4cf61c2..8153d3d 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -1811,7 +1811,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcap.so-notice",
+    licenses: ["vndk-v31-libcap.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1932,7 +1932,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcn-cbor.so-notice",
+    licenses: ["vndk-v31-libcn-cbor.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2008,7 +2008,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcrypto.so-notice",
+    licenses: ["vndk-v31-libcrypto.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2058,7 +2058,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libcurl.so-notice",
+    licenses: ["vndk-v31-libcurl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2136,7 +2136,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libevent.so-notice",
+    licenses: ["vndk-v31-libevent.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2161,7 +2161,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libexif.so-notice",
+    licenses: ["vndk-v31-libexif.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2187,7 +2187,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libexpat.so-notice",
+    licenses: ["vndk-v31-libexpat.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2400,7 +2400,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libhardware_legacy.so-notice",
+    licenses: ["vndk-v31-libhardware_legacy.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2492,7 +2492,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libjpeg.so-notice",
+    licenses: ["vndk-v31-libjpeg.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2518,7 +2518,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libldacBT_abr.so-notice",
+    licenses: ["vndk-v31-libldacBT_abr.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2544,7 +2544,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libldacBT_enc.so-notice",
+    licenses: ["vndk-v31-libldacBT_enc.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2570,7 +2570,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-liblz4.so-notice",
+    licenses: ["vndk-v31-liblz4.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2619,7 +2619,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libmedia_omx.so-notice",
+    licenses: ["vndk-v31-libmedia_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2767,7 +2767,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libminijail.so-notice",
+    licenses: ["vndk-v31-libminijail.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2816,7 +2816,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libnetutils.so-notice",
+    licenses: ["vndk-v31-libnetutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2842,7 +2842,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libnl.so-notice",
+    licenses: ["vndk-v31-libnl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2868,7 +2868,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpcre2.so-notice",
+    licenses: ["vndk-v31-libpcre2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2894,7 +2894,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpiex.so-notice",
+    licenses: ["vndk-v31-libpiex.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2920,7 +2920,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpng.so-notice",
+    licenses: ["vndk-v31-libpng.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2945,7 +2945,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libpower.so-notice",
+    licenses: ["vndk-v31-libpower.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3022,7 +3022,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libspeexresampler.so-notice",
+    licenses: ["vndk-v31-libspeexresampler.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3047,7 +3047,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libsqlite.so-notice",
+    licenses: ["vndk-v31-libsqlite.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3073,7 +3073,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libssl.so-notice",
+    licenses: ["vndk-v31-libssl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3244,7 +3244,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v31-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3287,7 +3287,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_omx.so-notice",
+    licenses: ["vndk-v31-libstagefright_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3334,7 +3334,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v31-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3508,7 +3508,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libtinyalsa.so-notice",
+    licenses: ["vndk-v31-libtinyalsa.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3534,7 +3534,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libtinyxml2.so-notice",
+    licenses: ["vndk-v31-libtinyxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3559,7 +3559,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libui.so-notice",
+    licenses: ["vndk-v31-libui.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3708,7 +3708,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libxml2.so-notice",
+    licenses: ["vndk-v31-libxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3734,7 +3734,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v31-libyuv.so-notice",
+    licenses: ["vndk-v31-libyuv.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4680,7 +4680,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libbase.so-notice",
+    licenses: ["vndk-v31-libbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4734,7 +4734,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v31-libblas.so-notice",
+    licenses: ["vndk-v31-libblas.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4761,7 +4761,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libc++.so-notice",
+    licenses: ["vndk-v31-libc++.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4791,7 +4791,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v31-libcompiler_rt.so-notice",
+    licenses: ["vndk-v31-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcompiler_rt.so"],
@@ -4812,7 +4812,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libcutils.so-notice",
+    licenses: ["vndk-v31-libcutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4952,7 +4952,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libhardware.so-notice",
+    licenses: ["vndk-v31-libhardware.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4987,7 +4987,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libhidlbase.so-notice",
+    licenses: ["vndk-v31-libhidlbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5138,7 +5138,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libjsoncpp.so-notice",
+    licenses: ["vndk-v31-libjsoncpp.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5243,7 +5243,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libutils.so-notice",
+    licenses: ["vndk-v31-libutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5280,7 +5280,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libutilscallstack.so-notice",
+    licenses: ["vndk-v31-libutilscallstack.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5317,7 +5317,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v31-libz.so-notice",
+    licenses: ["vndk-v31-libz.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5466,7 +5466,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libbinder_ndk.so-notice",
+    licenses: ["vndk-v31-libbinder_ndk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5493,7 +5493,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libc.so-notice",
+    licenses: ["vndk-v31-libc.so-license"],
     arch: {
         x86: {
             export_system_include_dirs: [
@@ -5572,7 +5572,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libdl.so-notice",
+    licenses: ["vndk-v31-libdl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/llndk-stub/libdl.so"],
@@ -5589,7 +5589,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libft2.so-notice",
+    licenses: ["vndk-v31-libft2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5612,7 +5612,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-liblog.so-notice",
+    licenses: ["vndk-v31-liblog.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5635,7 +5635,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libm.so-notice",
+    licenses: ["vndk-v31-libm.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/llndk-stub/libm.so"],
@@ -5652,7 +5652,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libmediandk.so-notice",
+    licenses: ["vndk-v31-libmediandk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5677,7 +5677,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libnativewindow.so-notice",
+    licenses: ["vndk-v31-libnativewindow.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5700,7 +5700,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libneuralnetworks.so-notice",
+    licenses: ["vndk-v31-libneuralnetworks.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5723,7 +5723,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libselinux.so-notice",
+    licenses: ["vndk-v31-libselinux.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5746,7 +5746,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v31-libsync.so-notice",
+    licenses: ["vndk-v31-libsync.so-license"],
     arch: {
         x86: {
             export_include_dirs: [